Pass -DLIB_INSTALL_DIR and drop now unrequired libdir patches wrt #505584 by "jospezial"

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 17 insertions, 14 deletions

diff --git a/media-libs/x265/ChangeLog b/media-libs/x265/ChangeLog
index bee227b79d01..32bfc4c910c7 100644
--- a/media-libs/x265/ChangeLog
+++ b/media-libs/x265/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/x265
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.1 2014/03/12 20:45:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.2 2014/03/25 13:57:46 ssuominen Exp $
+
+  25 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> x265-9999.ebuild:
+  Pass -DLIB_INSTALL_DIR and drop now unrequired libdir patches wrt #505584 by
+  "jospezial"
 
 *x265-9999 (12 Mar 2014)
 *x265-0.8 (12 Mar 2014)
@@ -9,4 +13,3 @@
   +x265-9999.ebuild, +files/x265-libdir.patch,
   +files/x265-libdir_pkgconfig.patch, +metadata.xml:
   Initial import, bug #485352. Ebuild by Samuli Suominen, Yixun Lan and myself.
-
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index e79c29c0301a..7c57de2eb1b1 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -5,13 +5,17 @@ AUX x265-libdir.patch 1321 SHA256 e3ef1a0c7eb72a814963e4fc8b62d3cd5331a4e5f73d50
 AUX x265-libdir_pkgconfig.patch 375 SHA256 82b363812649168d2264ac91d71c6372eb8991e347389d37e81fcfd1d3ae7f60 SHA512 f039b741d78a5cf6ac92f6c4e84a182a117439e6cd61944950437a6d3866a4f51a6e1310745ba17904bb0e786a2aac740fbf80cb780ecad7c881072c5aff350e WHIRLPOOL 93d4e0292b3c5e83294a307975921c5f8f6cf140105460d3640315ff7f7492ad338b179faf47cae8a0f4682fbdd57c414280d4f645d67348c4835442c721de10
 DIST x265-0.8.tar.bz2 542439 SHA256 279985c47034dda4b3b9fef114aba3c8e8a3d1b26d59cc54ec7d52d13e086835 SHA512 78f7cd0aa6482d6ae921bf7cabc580cd9784a75920eb211a9cbe17fce2168fefe466e6ce1b21b8e7f4fd3ab51d80f33388bf6ec68e0203714294591d0c08b43c WHIRLPOOL 82136477653809fd39a9ad9e2db54bfe972e4eebf451295fd086e6c311d3ed6ef3db4b85c83d5620207035c43ad113ab0e6482357d448685e05950452b804564
 EBUILD x265-0.8.ebuild 1648 SHA256 ae13001a671ebb6e12978ecfb1516e9544dedd0dbf40a41c1b0c6045c4c661c7 SHA512 da3f2efd9b70a1c84ecc63d762d07727b741c7cbd22508670c40c8272b4e596a70425bab6d339493befb1c9e60fc73071df996e2c640bc3513db00f408b703e0 WHIRLPOOL 54c594d95bcc7c6582cb5d7e33038fb1b1e7e85f05a7386c0a7932c08fe31d5e0f8b3548505d31c4b94e03340d7f349d7a7a84ce6a39b8369d9ad46e46d0ee1b
-EBUILD x265-9999.ebuild 1649 SHA256 e3263457bc42231a6f3eaf8286e274376bc36b2a13da3e85c9bbb24a89529bb0 SHA512 c906e56779a049dce2f7eb4de266107619c808ad6887eac19510173d5a096723be79df4c6a733e83f9c5484cd134843ba938c40dd3ca25c059c939379fdc2ead WHIRLPOOL 4101251f340b6ad9dd352d0180f3a1278a702544f6988c6902516907b7b4a53666d7bf70ebd18e663ec0ba43b4366ae553a7d1f25fb1554e0f61b7dda8dc0721
-MISC ChangeLog 506 SHA256 52e259dbb2ee97c0abd36226840375e30736c0407050ea3caa85b65e87b8ceaa SHA512 2707b86842f15b3491c10fac9a1dcad758d5935da8ad4628ac5b0065605d988dc02b6a14aa4cfc3ed9c1480aa606f10b75c1ba0ddd461f3e6b1dfd894e5dd686 WHIRLPOOL 658eb0236fb43d6963a54afd1ff2466091b96e5abc45b684d6cdf53a2c87d47c763142c9ea641fdedb610b9f0194e3abee54e745fe83304772fbdf4a3c500b26
+EBUILD x265-9999.ebuild 1604 SHA256 027040691708ab584319d714d35575d16c1c907a1669f41617a6ba48d8a9d0d8 SHA512 c3faeeb9ac33d284fb8d9b05e938da8fec5ce9fc4b8e5867872ce17f0612a2cc03ce53bcda74cbeaf95acdc456aff6d6512c3a90c94009a500c7456dc07bd73f WHIRLPOOL 0480c9b17b410fb762707b5cd0c79982ac155746fa0979afae29baf051cd40803c5aa3f791e94addcae3e08eb417bd41d786b7300ae0dbe85030240e660adf6c
+MISC ChangeLog 672 SHA256 4163c098e7afefae1845d36c26542f8f167c791edb961ed5e1e965afb280478b SHA512 7f07e87fcae2e18fc38418b63935d215bb463815533bda20461d949f2863be8650f4a23b2b2bfb4620669d707df97bd500b930da87adc12676d9719b54f6b6b8 WHIRLPOOL 935ea7414ac6eb51c4d821099fd9b212eeb029799dce624aa50527f4c32774940c7cef7c9b25ffdca135682bc49b04f2b5bf0073ee9526ee877731d6b0be441c
 MISC metadata.xml 307 SHA256 98aacb70c596475ef9dd8cd433cb49e37e35c424861adcf901867e0f02827fec SHA512 403a65f0b5dbc39253d731cbf44839e073cff48e373f86baf63bdf8e8fc500d0837fa16be0df79950abc19310edba11da22cb6cabdaf9426fa39d136b48ebf3a WHIRLPOOL dad5401206a10b0c1d5823fb41a5c9c8158b8cb43312b123c7d2bdf66c6bf35697ca17238a02cc6288750bad279bc414dea80d7d83f81230957f4a08997fd6c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMgx18ACgkQvFcC4BYPU0qTKwCfaJ6vOaVII7x+jlDQLLvbI+7f
-c4IAn3lFckPQeIlPXlVKGYB45QTfcXI1
-=+HC3
+iQEcBAEBCAAGBQJTMYo6AAoJEEdUh39IaPFN7r0H/1lmM671/schi+zW9jh4oHCQ
+mwSkAf/9lvZOPopN7gMbAM3cjtq6UFx+N9+NGqxRQyZ8k0fXHp1zy3TqUR2bmXnO
+DLwPWUcHCsPfnn0sypvVx0L89IWnliMJCEeflNIytEvDTK4BOdAPNh7GU1YkHKcf
+/Kl2A+k8SoXHk0dBO/0Fo6r3H5Qc9H64CFQrEXIw1Ukcv5a0GuyGv2ncP5C32NGD
+4ipkLcc28THL3f9Sf/ZCUCOOXmmWEqHWbnAfZUAlJCbm5XKtKChqc09rJS7Fc/TE
+LddAh22K6+h3JQOj6I865B7qpZXdsM6zHSkCg/zO7dDUIjw1IAzMmHW8CRMLA4A=
+=Ewfr
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index fce836a7006c..59f0a3f91f69 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.1 2014/03/12 20:45:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.2 2014/03/25 13:57:46 ssuominen Exp $
 
 EAPI=5
 
-inherit cmake-multilib
+inherit cmake-multilib multilib
 
 if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
@@ -28,11 +28,6 @@ DEPEND="${RDEPEND}
 	abi_x86_32? ( ${ASM_DEPEND} )
 	abi_x86_64? ( ${ASM_DEPEND} )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-libdir.patch"
-	"${FILESDIR}/${PN}-libdir_pkgconfig.patch"
-)
-
 src_unpack() {
 	if [[ ${PV} = 9999* ]]; then
 		mercurial_src_unpack
@@ -49,6 +44,7 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_build_binaries || echo "-DENABLE_CLI=OFF")
 		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
+		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 	cmake-utils_src_configure
 }