Fix underlinking, bug #547486

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 97 insertions, 25 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index bdb56319abce..21c16dfa5cc8 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.43 2015/04/08 18:49:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.44 2015/06/28 18:25:51 jlec Exp $
+
+  28 Jun 2015; Justin Lecher <jlec@gentoo.org> +files/mathgl-2.1.3.1-x11.patch,
+  mathgl-2.1.3.1.ebuild, mathgl-2.1.3.ebuild:
+  Fix underlinking, bug #547486
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> mathgl-2.1.3.1.ebuild,
   mathgl-2.1.3.ebuild:
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index c2fad9778532..b46d5eca6024 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX mathgl-2.1.3.1-x11.patch 2585 SHA256 684d1499009fc93a9b76cf40559014b5a898658643a20cdafe9d93a482b62343 SHA512 7ef22932f2f2c396f5d7d9b09bf0e8513442781e6227ee5f11c66dbfa4e6afb357a576a0c1d29158733322cb676ec50afcc289caaca4e45597309e42d9635aa3 WHIRLPOOL b50113b8763785be846c72b854112baa8e0ccef82893e66e4a5cf363f6d9340555bb391b74ffb5719bf913c719a2781eed78a503d6eac50bc4350edad74711d0
 DIST STIX_font.tgz 2450541 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5 WHIRLPOOL 912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e
 DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc WHIRLPOOL 3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
 DIST mathgl-2.1.3.tar.gz 5269347 SHA256 b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73 WHIRLPOOL 9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
-EBUILD mathgl-2.1.3.1.ebuild 3918 SHA256 c44f14d87a7b12ff872e1201362e50989d9c13ec6263e051856b3546dd756c71 SHA512 44ec54b65888ad720b7c7be52fa36bd4a08c4872eee7e7fd2f5989dca5b6a3a185a08563b8974383380665baf0ef357a85b4b0ea4b9fb9034d00f031e973a399 WHIRLPOOL 8afb2e8adc066379accfd526c0ed19c69d466b92d25bbaaf546ff5dac4315af5d732825eb0c04362028c0420393eb02743c2e6cfbe3e49e3efb22458f48f6744
-EBUILD mathgl-2.1.3.ebuild 3916 SHA256 51e33b7129c7d31eaac496e4cc78f9b1b57bb6b1b7d5fc43a28b79b447ad3f4d SHA512 2cce4ef4865915f0ea46df12313ca13cc2cdf65a52ca93c3b47b67c95fabbef1c6909a9c748b0586595d61f8e6e155ecee73490e8ffb7ad474d2bd55fd775b5b WHIRLPOOL 13aa3927ec192dc3e24f3856585bae234480d052aa8ae067dc15acfa46af56ef847e33a640d89a42555747346e6b0c558975661079d7c23a6288a420541a7f6e
-MISC ChangeLog 8190 SHA256 68ba6baed70fd74c2b1d635b83981067885893e49416628cc26947f84755a117 SHA512 20b2dc0bf5de2412188990135202ddf8b5a2a1eafd6ddb176910065592261927f426f70e44971f064d13e09003ae6f97d41f8f78cfce65fa4aae0481b4319d62 WHIRLPOOL b0d80fbcbd903ac4976db87e289cb7fdaed9a28c6c109de028f9f29cdf94ca7c9b3612cb92531f312c8c744ce8e242aebd736c05dbe3b2fc4a464133efd3053c
+EBUILD mathgl-2.1.3.1.ebuild 3958 SHA256 3153b80d09eeb5a6176b04a7344a97de15a625297abdbe257856db70917071c7 SHA512 d991bf5f13458bc029b07766d479d094e0602a59af161c0e572724f6cad3712668b9ad804b34a372d40e24f6605a1d732faf2982487f5743f4373d4a1362155d WHIRLPOOL 1dd06a9d1f0f83de4d3d5087a0f613178a5e067fe4d2db0891abcbed15556e0ccef76eed4072ac6954d6d0c5d19f1a5e33c34921d945e63af8d1bb417403fd5f
+EBUILD mathgl-2.1.3.ebuild 3918 SHA256 bbec93bd6d93c384e728ec0ffe36d515657b2478e3ea536c4aeaa18802bbf066 SHA512 222e41aba227162d266fa28d4ee12bb0332d1a959a823f13772e5129b6ab27a92dcee695af776c1fad6b1a82ac88b44193605db32d8f4891e8978bc69a3a89c9 WHIRLPOOL b0ca6b40f287971838479fca169b44e9ee7770350c5ab7164001cc49b482174a2e77523e01c4869830bd16ebf263a66c89ff1d09c33eeae2ea459861f76bbeab
+MISC ChangeLog 8347 SHA256 bd3f680544cf9fe5ffbf7c2f069c1441b380d5b226f3842f118c26fdd6b99676 SHA512 05dd03766a6353e086f8d104d98a943d85865025d485be2ce417cd2403efc5a5ba54398475a96a3b0dbb17f86ca17acca82b1d6a9ef5d1afcf16adc85fa5cd82 WHIRLPOOL c88b505e82349536540945e4e83c116458b51e2e485672b70d737d7ce9a8bce4e22c0f5ff4a00f0f608b0385ff1d0f1c0846b1ea46f675069c732f3c861888aa
 MISC metadata.xml 798 SHA256 66317d4c1c8537952e296d52eae36a8d3fef1d804cb87d33ccbc1984c982ddd6 SHA512 8409c65a35443173cc7552735b09241aa4cad2608d451398026ac79ac4863514492b83ebce86eb713dd6975967f1b0242ce7eba811305299199c022845df0b5d WHIRLPOOL a5b29853a4f47525b8b81138adf37d0e061378cb50047fa0f15cd2386f0eac319558c9af269a08b2985ad03d7a7d623968c6de91dd26458107fab63d5cdeedab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfx/2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVkDwxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisvAP/Ao+/DerirxkWPAYr61AiOC0
-bKE+xTBQl0nIusLSvAW14tpB4hmLs6DMvUgfH4xVDcxnyuJ8mPUlkaeeLcVFy0oK
-U5TH1xXybfaU9vTifWRrMnvfIeTKD1AOBlJ5At25CzVhDS8pljM1WjnaFjbMJmQS
-x2ovyYaquFqL74tHjv8ykBRfL+ESfEX26aC8iKMAAEjN/02crtKhUBlGBJRK3NZD
-b5SkA4qAY4n5wAfGHP9xZZHzMw0azuMDPG3632gToZ1U78rbCXHxx0A7IZuLPrFh
-fvJZxT50D0wsp2EGcF/majCSdzheZoLkry3Vi8YpDDHsIMIl6AudhVhRNOtm0r2I
-sE4hkjqb8NoZeiCZFF0lX8RCk0aptjUc2MqETB2hu9ADZ7xKFvWEt5kArE87Cfq4
-r6iAX3sGAlafEz4Vcbj4t2T4ImxK3XDo3SW0erv6mvCksVC8vLYMkSr2RC52aWpP
-2kcs9dTu5bP53bFswsNSQ304g4oMHYWR/YcjSro9wFwrdTJN/aGTw0vHM7FKo1fy
-TGfL9EDFdVsoGR1wyUCckir2Klf1u4MA67h9Zq8nYEhzAIme6JsrXy6O7O4litqy
-1eo0auYGFIEvR2E7E7JXWTUiJ9v7uBZbRSAkbRnPoQ9EuL8ZBPIim3AGjfBYoKvf
-DDqo6o7tSaNwXWPjZOjo
-=34OD
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilX8QAKP+P1zyBaw3ivuqkbxIVi9t
+w3xj0PLP1HzacBooRlV7XviJJ4nPR3fsdsgUQAAV51jBisn3V/KPZtl8gXq3sseK
+Ha8BM4ZHNdP+FpX4Un+595DHk9YAoYfw5J3o6k1W+ICy9FALwiv/pJHtPVoX7+vH
+FD1CpLwHDefXDZktXwWdGaDzbfJ8Yhvdsrd7j4Qcq5cwuIWmbSpwcyL2ZMud6OEE
+IDMARnd7wbQO8T3x3G1POzuknRPaCe6FvbM9kfDIzRgLL3UewITh6wgdSROydw9h
+ChF6hOY1BP8vHRRiLeSLQ42HP6S26cL3vC5/+luZh7QPHHID1xeSh6/uVPGUBoeH
+GgRFtyT32AQ9lex66Aevzw1PQ8N2meCtGZ1RHArcY2shB4ilFB77NS7CRGILqnRr
+/rDPj0PK761gnbHjo/5uW8pT5gClHMRIilrH4g8JRCgvLt/OZK8xdkrAbn73zxWr
+2mNP8DAbK13t9wsktT+oMYSp31bDUZ52KE4WfAlCrz+Mi3WqzD4vP9ENBj7+72Fi
+qyDqRJqPSCmC6124CJcRdVVG0oWV5/78+tpN/aaNwRVSnB0S739ASuMLF7AHkVj4
+QLfvSROIAmp3eZeICarecVJQSvZdNeyYPPMmBDX7Y+VzCnbJKQM/Bw06siEKGeOz
+QUyViQlzt7MCSiG7r8Ln
+=IJc6
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch b/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch
new file mode 100644
index 000000000000..cff27870d365
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch
@@ -0,0 +1,65 @@
+ CMakeLists.txt         | 1 +
+ json/CMakeLists.txt    | 2 +-
+ udav/CMakeLists.txt    | 2 +-
+ widgets/CMakeLists.txt | 4 ++--
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3364973..0c3a645 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -316,6 +316,7 @@ endif(enable-wx)
+ if(enable-qt)
+ 	set(MGL_HAVE_QT 1)
+ 	FIND_PACKAGE(Qt4 4.8 REQUIRED QtCore QtGui QtNetwork QtWebKit)
++	FIND_PACKAGE(X11)
+ 	if(NOT QT4_FOUND)
+ 		message(SEND_ERROR "Couldn't find Qt4 library.")
+ 	endif(NOT QT4_FOUND)
+diff --git a/json/CMakeLists.txt b/json/CMakeLists.txt
+index 79d4716..0a53874 100644
+--- a/json/CMakeLists.txt
++++ b/json/CMakeLists.txt
+@@ -9,6 +9,6 @@ include_directories(${MathGL_BINARY_DIR}/json)
+ qt4_wrap_ui(json_ui_src MainWindow.ui)
+ qt4_wrap_cpp(json_moc_src ${json_moc_hdr} )
+ add_executable(MglForJsTestBench ${json_src} ${json_moc_src} ${json_ui_src})
+-target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES})
++target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES})
+ 
+ endif(MGL_HAVE_QT)
+diff --git a/udav/CMakeLists.txt b/udav/CMakeLists.txt
+index 9a9c574..a1ff2df 100644
+--- a/udav/CMakeLists.txt
++++ b/udav/CMakeLists.txt
+@@ -27,7 +27,7 @@ qt4_add_resources(udav_rc_src ${udav_rc} )
+ qt4_wrap_cpp(udav_moc_src ${udav_moc_hdr} )
+ add_executable(udav ${udav_src} ${udav_moc_src} ${udav_rc_src})
+ #set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+-target_link_libraries(udav mgl-qt ${QT_LIBRARIES})
++target_link_libraries(udav mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES})
+ 
+ if(MGL_HAVE_PTHREAD)
+ 	target_link_libraries(udav ${CMAKE_THREAD_LIBS_INIT})
+diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
+index 90ea00c..f582003 100644
+--- a/widgets/CMakeLists.txt
++++ b/widgets/CMakeLists.txt
+@@ -93,7 +93,7 @@ if(MGL_HAVE_QT)
+ 	set_target_properties(mgl-qt-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ 	set_target_properties(mgl-qt-static PROPERTIES COMPILE_FLAGS -DMGL_STATIC_DEFINE)
+ 	target_link_libraries(mgl-qt mgl)
+-	target_link_libraries(mgl-qt ${QT_LIBRARIES})
++	target_link_libraries(mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES})
+ 
+ 	if(enable-mgl2)
+ 		set_target_properties(mgl-qt PROPERTIES OUTPUT_NAME "mgl2-qt")
+@@ -137,7 +137,7 @@ if(MGL_HAVE_QT AND MGL_HAVE_FLTK)
+ 	endif(enable-mgl2)
+ 
+ 	target_link_libraries(mgl-wnd mgl)
+-	target_link_libraries(mgl-wnd ${QT_LIBRARIES})
++	target_link_libraries(mgl-wnd ${QT_LIBRARIES} ${X11_LIBRARIES})
+ #	target_link_libraries(mgl-wnd ${wxWidgets_LIBRARIES})
+ 	target_link_libraries(mgl-wnd ${FLTK_LIBRARIES})
+ 
diff --git a/sci-libs/mathgl/mathgl-2.1.3.1.ebuild b/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
index 5edd5cee4ebd..6b8100122cb5 100644
--- a/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
+++ b/sci-libs/mathgl/mathgl-2.1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-2.1.3.1.ebuild,v 1.3 2015/04/08 18:49:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-2.1.3.1.ebuild,v 1.4 2015/06/28 18:25:51 jlec Exp $
 
 EAPI=5
 
@@ -33,10 +33,10 @@ RDEPEND="
 	gsl? ( sci-libs/gsl )
 	hdf? ( sci-libs/hdf )
 	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	octave? ( >=sci-mathematics/octave-3.4.0 )
 	pdf? ( media-libs/libharu )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
 	qt4? ( dev-qt/qtgui:4 )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
@@ -76,6 +76,8 @@ src_prepare() {
 	# fix desktop file
 	sed -i -e 's/.png//' udav/udav.desktop || die
 	use python && append-cppflags -I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
+
+	epatch "${FILESDIR}"/${P}-x11.patch
 }
 
 src_configure() {
diff --git a/sci-libs/mathgl/mathgl-2.1.3.ebuild b/sci-libs/mathgl/mathgl-2.1.3.ebuild
index 5d3ba0cb9d7b..72b953539274 100644
--- a/sci-libs/mathgl/mathgl-2.1.3.ebuild
+++ b/sci-libs/mathgl/mathgl-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-2.1.3.ebuild,v 1.3 2015/04/08 18:49:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-2.1.3.ebuild,v 1.4 2015/06/28 18:25:51 jlec Exp $
 
 EAPI=5
 
@@ -33,10 +33,10 @@ RDEPEND="
 	gsl? ( sci-libs/gsl )
 	hdf? ( sci-libs/hdf )
 	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	octave? ( >=sci-mathematics/octave-3.4.0 )
 	pdf? ( media-libs/libharu )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
 	qt4? ( dev-qt/qtgui:4 )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] )