fixing bug 525184, allowing bundled libs to be set individually

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 42 insertions, 25 deletions

diff --git a/dev-util/intel-ocl-sdk/ChangeLog b/dev-util/intel-ocl-sdk/ChangeLog
index be046e972c6e..5b6cf98b6dec 100644
--- a/dev-util/intel-ocl-sdk/ChangeLog
+++ b/dev-util/intel-ocl-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/intel-ocl-sdk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intel-ocl-sdk/ChangeLog,v 1.15 2015/03/31 18:16:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel-ocl-sdk/ChangeLog,v 1.16 2015/04/20 16:43:29 zerochaos Exp $
+
+  20 Apr 2015; Rick Farina <zerochaos@gentoo.org>
+  intel-ocl-sdk-4.4.0.117-r1.ebuild, metadata.xml:
+  fixing bug 525184, allowing bundled libs to be set individually
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> intel-ocl-sdk-2.0.31360.ebuild,
   intel-ocl-sdk-4.4.0.117-r1.ebuild:
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index 493791255177..16c5e0f731b9 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -4,20 +4,24 @@ Hash: SHA256
 DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 SHA256 2044a9a62f40788b0dc4f4ea77a3d85df14e7909258e37eed3e63f7254a0bcc9 SHA512 6974dd67d8292400f1d0c80fd137f39290fe7dcab5146b9f0613ae48484f84e1b523f710dcc07c8600919ce01ab2dd91ab0e2d693e3723ffa9a744fcc52151dd WHIRLPOOL bf474c5959d9b19b40491a68355c2f36bdd0b98facae75aef4f488726b9589555d49f4bf8eb47f52524be6d354addbc945621a97b6f5412162e5b0c8aa03243e
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 SHA256 23402790acc5bfe4949f48f02ce2c13f188588a5721690e04526e4bddb93c7ea SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9 WHIRLPOOL 6cc25a3f193314c8aa32612fa901deb6782f42f51b7b1578778d8e8273b7161802619b1a533dad0de9757d31d40a3ce910517c9794bdc2763b4fefe28a7cb968
 EBUILD intel-ocl-sdk-2.0.31360.ebuild 1569 SHA256 af60874c24f5919e49e8ca4f53b702b74d68d0078eaee5c3b43bece5adc93df6 SHA512 b20703d9e3abad1f5a244eaef05d6cfa5f7b03f40a95044a3814f2cad21fa0c5a7cf1cbf9fb70450ca53649de9e8019ccf1188453ee27ab1c877c45bcb5e82da WHIRLPOOL 5b16177c6b5acdd43ddf1892a5dbc0e350579ace56cee09170f899ee4aaf65508d7a7df6e3a384c279cc33f1cb364d973c51bc1bdf9b553b4a1c949021baf1f4
-EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2273 SHA256 4a175a884c9ae9e8220d66ed7c03e99fbf60b1ca8d9b8cd127a34a89d4daa83f SHA512 bde9680c17cbd014af970210ee8e8cf1aebe471083ba3dab1ffa827cbdd789dc62fcc033f39b00901cdf0eaacf10c28b7bfd3a8e5531d3f4d92dd5b42c8f0d5b WHIRLPOOL 9ca231415f39cdc125b024754f08a7259be46ad1503f851180a9e958393359752c4d3c27f0f574ededbb640829dec5f4f867ad91a0cdbde144878cfb4fdbce2e
-MISC ChangeLog 2365 SHA256 f96cb4440ad0175e8c2189dfdf110160f5c7ed84c34f58da70d91df77d1d4e65 SHA512 ad60b7d33ca7cc69c7301058a5cbe05d685e5ef3507fce324cdb3e1e4c81e50b06918678dc9a93cc2ac3975ed6084af3a6b2ebb91f8696e6d266d8a456b1743f WHIRLPOOL 9e50987482d5c452517b7ff835ccb0835381715d9d85850a9368616c37252fca8ad70ab774046289d9d9ff6f47100201db174160e304444132ab5d1463b5f69f
-MISC metadata.xml 521 SHA256 cb73e1e8c0b0255c43dd1707fc2b9b787caf1d7a472b06521b54b639c6326158 SHA512 d96b90bad0ac07d4fa37fdba58d0aaa399f6a69c854ff3039a5946756233190b00b850e2e8937803f55aad1cfd03b3bd0c28341572b0ea173e42bbbdb936adaf WHIRLPOOL ed9247422075af78fd190f5cbd1fd9b311ebe11f4934c9933174f821bf68c721f3acdc71d180d076f6ce953df16ebb09c8de32203249fe85e90f24918ad71940
+EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2478 SHA256 c39781fea2040f7f37360796eebcd3dae597d9c4eef76cb0f264bbfaee1a3203 SHA512 e998992f37c373a3fcdc2de55d850e7e9b0e237909555fdcfee20190b7963f7b50b93f2d8eaccd6ee6f95840921ec2a966931bd3d82830db0a12f5782d8813a2 WHIRLPOOL 315a07572be9bf952aac77aef2f322bdee1a6701292f9f055b54238c8a0c338f89fc4f1d3842203ec00cbb179e61b0703bc4153021227147fe28c16419e40d3d
+MISC ChangeLog 2539 SHA256 5745ca1fe51305c6d990939fbeda7d0a080b9ed0e627d2e3a3263f98797c89b7 SHA512 74337e1f48464989d1cfdfbcd3796b7d8675d705d641095df1b647abf92ea306b5908f7b436efab8d3347b5df7b56ed93e5de48d302de4da0938cf3010becbbf WHIRLPOOL 8bd055aa39ca26d885e81de7ed5ecb74b2b4dda78e107f394ed07550e91da47419506f8ca681b3f7d5497daed2bd8ff2a8be95a6ee12d3521b2053966e743281
+MISC intel-ocl-sdk-4.4.0.117-r1.ebuild.rej 780 SHA256 c6b042d938d46a4bd35f4f6f7d5ef09fdedc386eb8baa20b0fcb8e545bce911c SHA512 8e38b63d110b36f1641eb5dba7526974fcb070f4488d61b46016670c35e05f5f0d2bad413c4bc1ce674db92345225d06d2bf4f8919b2fd99f704f2d99bb6568d WHIRLPOOL 28ff2ad801d634eb90840c681d16b0d94d3d668cdd3c6e63e1e18d2fed0e582f65af4b7a5ec3917a9d08d4d3b62096dac93b44c6a548ca60c6fab33056eba589
+MISC metadata.xml 843 SHA256 a621d06d5e4a89297de6c344774777c099f68a4872eef1b17f72bbd83ebcb3b4 SHA512 b049305d3dada1ea3e68f6ae8c69a689ae14070c35ceb3c575915c820324dc796f66c687c2cbc9309d0fbc43480d8d9013374cacb75a058e237840ea2a656b17 WHIRLPOOL b74a0667bfb8bf7c477545cfb1e844cd5dd6f8ac21c37e674c1f9869927f9667bcd9c5062152fbdaa3fbd86dd4c19011a3728eccf389c439e90ead7b834dae25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVGuSFAAoJEJQzkH1pP7W4WgIL/juERBomQYrsoc3ST7YrD2N9
-n8tbMgn4pZP0GNSqfdApHZsUHzRSczLa2tj5MrcCCI0+ETM8ON4DcMxDV1zAhquX
-OwUfiH+ZedGlyJ17GQ0aB7Ap8TMJNo/uBWimO53MxtL0LH0r7RFbrcTcAYDJw7+D
-rN98PviG9w8hUDnpMiD+qermzVOCckMMv2bDw0JL9mQ+we9OtFguPcWYOvfQf7JI
-eelFD4ccYB1okNLMZ/uJR+bBMgefuG15r+4BTscpruk7ukE9FeXQ16RpBkDqNWk9
-7kvQFc5mudYh4moWasFfvrnNvpE6eNaBoAe2R5RJpfTaiKHZ0UlxnRG8ZyGY+9Am
-2y6EdPB57Nl0ovPVKxPvSaNjUwfRyaooM9AwOe4AkfQkKN4lnUC8gXMAv7W7TKPF
-k0gMxuOOAhHwSg6VbhNKBuX6hpuPuG6RZBSi2KsQiNVo9YSJ1W2oapyJZnZchaCF
-WgfrsNCPEe6bTyCSedjQi35wdN/ZOFDqH0jXkBch3w==
-=oa2v
+iQIcBAEBCAAGBQJVNSy9AAoJEKXdFCfdEflKR5kP/3hva9Pdtf0zPKBYINYH5G6i
+xewvO2YrJUuqtTWRcKMwABvt7MxFS10WQ+b/7WiImT8rKflZL7+HsjNjvqp3VpsL
+PnSQfWS2k2ZgtU4UuossqeD+GxJdN/yI5utxypkqt8XuUgGLn77HpBqeosKoKcEE
+AI3PIfwjXPO5a+R1U0R9fu0xFrsIzEqMyyD1XT4XJK2ttatRHQF+0PEE2wBDpoym
+xMghMT2PktoKrx49YY7h2ig18ePsiqQ/z82L63irowvoxe1KciN0OYygRcUzMRMi
+OZhO8qM6H2r6lR0KQRqJsBkfTElG63Lw6TbkReNjhEzK2cOccgf76BGa4K0FhNcI
+bh+ePgbYQu5gBer7IKI2AfCeEzhG3ywdZCCdDGYkXq+4xG86ig9qQSuKcCwrfD+F
+nQo/UZVL4zJT1Ea2Ybk1WqZ/vWmO01IuIOLmaBabvIly3WnXUWhEC0KwRJF0xLN7
+Uh6HDmaupkvKjz6ZbiM4AOmOercsguzwISOfZ4M86MyXmicR3oyMds/u2FmoKb9Y
+KLdT/34FOlThUm9E+q5/9wRMzi9fVp6NNVHXLHmXGk5BtMTrP1/ZYJA5MBAvtRrF
+834XGUKWrnSBAxM5XR3p/1PDuNeBX2BapAuI/1Si0K4qIrmBxIHfBp0XSM72e/qs
+da/taqswUa0I1+Vm7SYA
+=5qI2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
index 5b9aa7457ab9..f2858a625974 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.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/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild,v 1.3 2015/03/31 18:16:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild,v 1.4 2015/04/20 16:43:29 zerochaos Exp $
 
 EAPI=5
 
@@ -12,18 +12,18 @@ SRC_URI="http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_appl
 
 LICENSE="Intel-SDP"
 SLOT="0"
-IUSE="android bundled_libs"
+IUSE="android +system-tbb system-clang +system-boost +system-qt"
 KEYWORDS="-* ~amd64"
 RESTRICT="mirror"
 
 RDEPEND="app-eselect/eselect-opencl
 	sys-process/numactl
-	!bundled_libs? (
-		dev-cpp/tbb
-		sys-devel/clang
-		dev-libs/boost
-		dev-qt/qtgui:4
-		dev-qt/qtcore:4
+	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
+	system-clang? ( =sys-devel/clang-3.4* )
+	system-boost? ( >=dev-libs/boost-1.52.0:= )
+	system-qt? (
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtcore-4.8.5:4
 		)
 	"
 DEPEND=""
@@ -50,11 +50,17 @@ src_unpack() {
 }
 
 src_prepare() {
-	if ! use bundled_libs; then
-		# Remove unnecessary and bundled stuff
+	# Remove bundled stuff
+	if use system-boost; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so*
+	fi
+	if use system-clang; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
+	fi
+	if use system-qt; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libQt*
+	fi
+	if use system-tbb; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
 	fi
 }
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index 7c78cd336c3d..4064b68412b1 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -11,7 +11,10 @@
 	</maintainer>
 	<use>
 		<flag name='android'>Install android related files</flag>
-		<flag name='bundled_libs'>Keep bundled-libs (not recommended)</flag>
 		<flag name='tools'>Install Intel Offline Compiler</flag>
+		<flag name='system-boost'>Use system boost (dev-libs/boost) instead of bundled one</flag>
+		<flag name='system-clang'>Use system clang (sys-devel/clang) instead of bundled one</flag>
+		<flag name='system-qt'>Use system Qt (sys-devel-qtcore, sys-devel/qtgui) instead of bundled one</flag>
+		<flag name='system-tbb'>Use sytem Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
 	</use>
 </pkgmetadata>