Prevent unnecessary linking with libICE, libSM. Fixes #368753.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x29C3E2EC

6 files changed, 96 insertions, 22 deletions

diff --git a/media-plugins/gst-plugins-x/ChangeLog b/media-plugins/gst-plugins-x/ChangeLog
index d89eee1641ae..ae82329b1561 100644
--- a/media-plugins/gst-plugins-x/ChangeLog
+++ b/media-plugins/gst-plugins-x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-x
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.125 2012/05/12 18:10:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.126 2012/10/19 13:25:39 ford_prefect Exp $
+
+*gst-plugins-x-0.10.35-r1 (19 Oct 2012)
+
+  19 Oct 2012; Arun Raghavan <ford_prefect@gentoo.org>
+  +gst-plugins-x-0.10.35-r1.ebuild:
+  Prevent unnecessary linking with libICE, libSM. Fixes #368753.
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org>
   gst-plugins-x-0.10.35.ebuild:
diff --git a/media-plugins/gst-plugins-x/Manifest b/media-plugins/gst-plugins-x/Manifest
index 6e40340da4c9..4ba169f010de 100644
--- a/media-plugins/gst-plugins-x/Manifest
+++ b/media-plugins/gst-plugins-x/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
-EBUILD gst-plugins-x-0.10.32.ebuild 629 RMD160 8d387983df19cb38e18d1e018b741fb178b43968 SHA1 78dc976368b46389130f2de5a17c149987a04c02 SHA256 f20d0ea8df376b908e810c3cff20ffc63827f296c9b27caaf2588356309ca632
-EBUILD gst-plugins-x-0.10.35.ebuild 639 RMD160 2197d901f043747dc5dec644b088b67737ade31d SHA1 6947e80c55b4d41731a3c2a5b67acac7a361d66a SHA256 454d7b105736b4c1e2d53bc8fdd16739de8485f922a38f346f8851603845dd29
-MISC ChangeLog 15844 RMD160 6645ec49624cffa48ac5fad989830647659892f5 SHA1 7aeb77ebfb36140b5116cad593a1393dfb099471 SHA256 7ab18c6d40120a6923c5a90709b68797c8626638abc21db004f481b41fe9ec9a
-MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+EBUILD gst-plugins-x-0.10.32.ebuild 629 SHA256 f20d0ea8df376b908e810c3cff20ffc63827f296c9b27caaf2588356309ca632 SHA512 b687a88864f92ff19ba02b37a2d30f38fdd55f96463ae21c321bcd9893b349112f7a796dfb30bffd34a822769b72ea64e47335aada1b0bb688d12d6bde1212c2 WHIRLPOOL 35eff85e21fda9e24230b966351f90105d5a8020f5610023c9e984b29042281ce29f7ff9552cb2ba533fc77e5af4f28a6f33b0b22c197e143062c1a21d94cdf4
+EBUILD gst-plugins-x-0.10.35-r1.ebuild 973 SHA256 4f2908b92fb358c80ed620141ace6690bfceb73ecdc411a5385df53c4c93136f SHA512 4d99d89f27f4cfed0b27ccdd64035076953e3dd80bbe569b823f273e4efc2913589d04010a0e2505fe59ae964dbce56126d5c3ecd723a0454c600d96747a5fc5 WHIRLPOOL d0feb12c9bdf1cd670698d4ca00a12139b0c990a77cc248661753259c511e314298571d46166d17e26f62bd238922fac1acb38b1bbd79817e598c94767fe533f
+EBUILD gst-plugins-x-0.10.35.ebuild 639 SHA256 454d7b105736b4c1e2d53bc8fdd16739de8485f922a38f346f8851603845dd29 SHA512 3b58f11246f20c8d8ad317206d8070779df789a35df7459d20fce546a1766af524e30b9b739b9d977424d86a6df4ec333f0441381b8c2b9f17aa2bd9aa694657 WHIRLPOOL 1f66493aeb0e09642a7f624cca0ed87e66a5ce687d6e1d17f8da094e7c44a6b270188d920044f894dfd4371981f3720a877d8c829bb19196a268b829a4d3b40e
+MISC ChangeLog 16046 SHA256 48f1f075cc43789f413db407b72bc2cbd364daa9284a3537c7320e21a43b0c47 SHA512 b96d5072d06112429c955a56cda4b1dd29161dca7b1aece12241aa17c0a323c0ab136ea0a12c8ddb29b6974dea7932ba44d0556c0fc13ba591896ba8334341bb WHIRLPOOL 04d014d455ce44f066e2d624564732b408c7c6cbce92fdbf9ade37739a70be7ac64d84512231a62dc7a1fc2c5e9926a7e03f6e41ca99c8c5737b0397ddfa5025
+MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+up58ACgkQvFcC4BYPU0pwkQCfc4l3hdAm7DtqJyt4TkJtiP68
-27EAn3c3nvXlPONFes6bo4+VDSqkOBY7
-=jeYa
+iEYEAREIAAYFAlCBVPgACgkQ+Vqt1inD4uxC9wCfW3f3q/p1jSME0G9T5oUBfzUf
+AToAn29R4cQHBIaYL1T4Fga6qwM9dLFb
+=gQuD
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35-r1.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35-r1.ebuild
new file mode 100644
index 000000000000..4f313c82913b
--- /dev/null
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35-r1.ebuild,v 1.1 2012/10/19 13:25:39 ford_prefect Exp $
+
+EAPI=3
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+# xshm is a compile time option of ximage, which is in libXext
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
+
+src_prepare() {
+	gst-plugins-base_src_prepare
+
+	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
+	# though they are not actually used. This needs to be fixed upstream by
+	# replacing AC_PATH_XTRA with PKG_CONFIG calls.
+	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure
+}
diff --git a/media-plugins/gst-plugins-xvideo/ChangeLog b/media-plugins/gst-plugins-xvideo/ChangeLog
index d6636989ea92..628b8630949e 100644
--- a/media-plugins/gst-plugins-xvideo/ChangeLog
+++ b/media-plugins/gst-plugins-xvideo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-xvideo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/ChangeLog,v 1.185 2012/05/17 15:26:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/ChangeLog,v 1.186 2012/10/19 13:25:45 ford_prefect Exp $
+
+*gst-plugins-xvideo-0.10.35-r1 (19 Oct 2012)
+
+  19 Oct 2012; Arun Raghavan <ford_prefect@gentoo.org>
+  +gst-plugins-xvideo-0.10.35-r1.ebuild:
+  Prevent unnecessary linking with libICE, libSM. Fixes #368753.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org>
   gst-plugins-xvideo-0.10.35.ebuild:
diff --git a/media-plugins/gst-plugins-xvideo/Manifest b/media-plugins/gst-plugins-xvideo/Manifest
index 3e6acc71b077..46e48dad6d8e 100644
--- a/media-plugins/gst-plugins-xvideo/Manifest
+++ b/media-plugins/gst-plugins-xvideo/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
-EBUILD gst-plugins-xvideo-0.10.32.ebuild 671 RMD160 756cc36b40d17d71be2d6f5d73e818539a90c5ab SHA1 6819800bb9152b00296c4df80fe0c1227bed227f SHA256 dc736136c1ab31872324fb98d797e36ed9c47a160b6c0188504f36d44f589e52
-EBUILD gst-plugins-xvideo-0.10.35.ebuild 681 RMD160 2c34307aaae53197d129a46ecfde4b47f29a7623 SHA1 5745439b79c0d683d8d7b37a4caa55f5b22853a5 SHA256 d6b22e0ff06bfe86f8973d494475d0000d566879c9f43780217c4dba133a762c
-MISC ChangeLog 23947 RMD160 5563c1fdb7b8ba61f393085d78903a37b782229e SHA1 2076b79c740ead19f3814459c194c024c7686fea SHA256 846b74d3a5c33464718d4ad7563b29b49fd7e7ec9d080a44cdb624ab54168423
-MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+EBUILD gst-plugins-xvideo-0.10.32.ebuild 671 SHA256 dc736136c1ab31872324fb98d797e36ed9c47a160b6c0188504f36d44f589e52 SHA512 b7c8c123b2a6801a64dc0400a5549cd03a8d336dc4b147ea035a28cf7df17d80ac027999dce2aa7bb6cf76f26541cde45d6bf4e635f5348eb4da5af286cb1d8b WHIRLPOOL 78b7da5e4a1b0b7d2bcc365e47fc666d5284500c46c9c5344fe50ba6b2341d3285e95f7a3f690f2ea59aaccc2fcccc281466ea67bcb0fe71f4c3e3680b8788aa
+EBUILD gst-plugins-xvideo-0.10.35-r1.ebuild 1015 SHA256 9e5ee2df1f8d45a57a303c66bffcf0a3a4dc34954ac0ca2e7f8c88809c448d63 SHA512 201984cc9f9093ab9b2d3485761cb67457021da964fbad63299f7886ed6f8d61c83b78c409055691a7943c2aae9af2c46f02df7a290e62e67757319a6aacde61 WHIRLPOOL 41b68092bc8f8b17b8567020871b227bf9c97141b33be5839c345ae42938398b90dd5d8f09718f22c8ce597d0110030ae3920c168221e1167bff9b536481bb44
+EBUILD gst-plugins-xvideo-0.10.35.ebuild 681 SHA256 d6b22e0ff06bfe86f8973d494475d0000d566879c9f43780217c4dba133a762c SHA512 454907d99f8aa24b6f8f12d6732aa060caf260fbf5915319f19d502d5eb5ea25622bb2ceb2fded743d3d8d53d7584ad08e74b9c63a4248ae0c4ede4dac4de3ff WHIRLPOOL da6346b6070eca7b9a593370ee74956ddfa3b8f8aec193deecef316e678e6a30bab64e8e298965d98e8d6cd60f36dcf8793867992911f49a517014890518f5aa
+MISC ChangeLog 24159 SHA256 ba96e7edbdf8bb79f564213d903906296a263ef62734af969c9a23f3f41d73e6 SHA512 150536919d113c7aa0c7e1518af5e4ec6782d36abc2ced5afd94ef16a3099d7c7e1004edf4f0517438702d13f84803d356d1045a30981967a27b04caf61f1fc1 WHIRLPOOL b42768892e3c8a2b18bd530863a4595650404922826e7180098688c34e8e11164bdc6663238698e062fe244762e2a600853ebe8e11c5baeb4f192ca2d997c434
+MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1GKsACgkQvFcC4BYPU0pdjQCguFnwxE0MTeBLEaGvZffzP9N1
-OkQAoKTN99PhcSkYIY2FGENhdTz3Vmnj
-=fFI0
+iEYEAREIAAYFAlCBVPoACgkQ+Vqt1inD4uyR/wCeM/sA6oLJeppwyQyu17vXAqhF
+860AoKqinksam5RTiKKPsio1mP5iz5wJ
+=MqM6
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35-r1.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35-r1.ebuild
new file mode 100644
index 000000000000..75f82506296e
--- /dev/null
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35-r1.ebuild,v 1.1 2012/10/19 13:25:45 ford_prefect Exp $
+
+EAPI=3
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXv
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/videoproto
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+# xshm is a compile time option of xvideo
+# x is needed to build any X plugins, but we build/install only xv anyway
+GST_PLUGINS_BUILD="x xvideo xshm"
+GST_PLUGINS_BUILD_DIR="xvimage"
+
+src_prepare() {
+	gst-plugins-base_src_prepare
+
+	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
+	# though they are not actually used. This needs to be fixed upstream by
+	# replacing AC_PATH_XTRA with PKG_CONFIG calls.
+	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure
+}