Use Requires.private and Libs.private instead of Requires and Libs wrt #380197 by...

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/x11-wm/emerald/ChangeLog b/x11-wm/emerald/ChangeLog
index 4af814d4f9634d28fc5330a6a67275a3d24ca775..184e8c3cdd8d1a10b2362d4ecde8536d0dc2d440 100644 (file)
--- a/x11-wm/emerald/ChangeLog
+++ b/x11-wm/emerald/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/emerald
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.35 2011/03/21 22:38:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.36 2011/09/14 20:47:24 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> emerald-0.8.4-r2.ebuild,
+  +files/emerald-0.8.4-pkgconfig-pollution.patch:
+  Use Requires.private and Libs.private instead of Requires and Libs wrt
+  #380197 by Diego Elio Pettenò
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   emerald-0.8.4-r2.ebuild:

diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest
index dfb7d734d48e0efcbc88c21bc763d824e0c4f4bd..5940fd7ba283354ccc25d933ab7d593f0944de14 100644 (file)
--- a/x11-wm/emerald/Manifest
+++ b/x11-wm/emerald/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX emerald-0.8.4-gtk+-2.20-build.patch 1194 RMD160 f87d90db0341b77937b1c32521752bf0420974f8 SHA1 849f7aadb60dc702260e9900330cd5bc2a5a3242 SHA256 c196b2720ffa2996992e02b62d02f67c0f7f9dd7301fc6ceb26a1b1c81d5bcec
+AUX emerald-0.8.4-pkgconfig-pollution.patch 353 RMD160 bf3505f23e43b853524f0a12016a8b06762e7420 SHA1 7efec914dfe6b8bfe53386ce5d96d58a95eab9c7 SHA256 bd4540b8ed94d5b7ba747a0285244564bae9d84cdba7a0fda3e2962d57e82224
 DIST emerald-0.8.4.tar.bz2 525316 RMD160 de04228414419141c3df0e7f32a062cc6dfabcda SHA1 408bef6ba7822bd933448f16dc43bbd3d801d9c9 SHA256 7ed5009a739219c61c26176f738ba5264e93557f353fdf9fc480c73fe8b05e26
-EBUILD emerald-0.8.4-r2.ebuild 1223 RMD160 282dbfc987a2333b11ebf0d0534aa8f42400020b SHA1 68622aa1927e0532f49156be278d674ff802bc20 SHA256 17f0949bf9071f6156ca770d8309ad038b80100368be9819a1809a77c1bb56f6
-MISC ChangeLog 5646 RMD160 213e8389631b42e816b637d0571f10220564b450 SHA1 239a740ed326c07f1989c3a0e46fd2c2d1ca0a47 SHA256 5e990a5fd92f0a73bec10a1357860422c5a71d57350cdf020396869a3f0d40e4
+EBUILD emerald-0.8.4-r2.ebuild 1322 RMD160 f718ced3d777ca6b3231b0edb4d1ff096fc645cc SHA1 16273fa1655d00c00913c89c4e3bf262821d4a9c SHA256 a20184ca2c985845718f2269da5ffd577ed8b18310dd885e19e201cdf6aadd79
+MISC ChangeLog 5883 RMD160 8cdf2cdc60c13d63206bb72bc781b440422d500f SHA1 9a143c50a307a23bfb3571c751f68c5a4a02ac0e SHA256 ce2d7581cd7b98711dd3723b14fb6680b2a00aa7750fe9937a785ac8c2ef0fb6
 MISC metadata.xml 294 RMD160 4e679fcbec940438f4c6918c047a4703a9edf7f7 SHA1 a10877882be8eb3e6b2cde8df9aad51f39ecd4a4 SHA256 3f2e1d5e049bf839f1dce07e7680ebf64c7e7713c0dadd799c9b7e49b701a98e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5xExMACgkQXkR9YqOcLPHWVwEAiSCEUSfLyH4TXN6eugIGvoD4
+Ui2yTxumkalcCT27VIUA/jfMserL+Jg3/cIdmHk3fq67Ao3TvAQvUqA0l3kF3RCv
+=6pKD
+-----END PGP SIGNATURE-----

diff --git a/x11-wm/emerald/emerald-0.8.4-r2.ebuild b/x11-wm/emerald/emerald-0.8.4-r2.ebuild
index 68a1b5b1bacb6d4387961846b3d8fa43b62cf3c7..a65c2e83bfe7c7e7ab8365ce86b6f9e193184583 100644 (file)
--- a/x11-wm/emerald/emerald-0.8.4-r2.ebuild
+++ b/x11-wm/emerald/emerald-0.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r2.ebuild,v 1.3 2011/03/21 22:38:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r2.ebuild,v 1.4 2011/09/14 20:47:24 ssuominen Exp $
 
 EAPI="2"
 
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+       # Fix pkg-config file pollution wrt #380197
+       epatch "${FILESDIR}"/${P}-pkgconfig-pollution.patch
        # Fixing GTK symbol - bug 308791.
        epatch "${FILESDIR}/${P}-gtk+-2.20-build.patch"
        # fix build with gtk+-2.22 - bug 341143

diff --git a/x11-wm/emerald/files/emerald-0.8.4-pkgconfig-pollution.patch b/x11-wm/emerald/files/emerald-0.8.4-pkgconfig-pollution.patch
new file mode 100644 (file)
index 0000000..047d8df
--- /dev/null
+++ b/x11-wm/emerald/files/emerald-0.8.4-pkgconfig-pollution.patch
@@ -0,0 +1,12 @@
+--- libengine/emeraldengine.pc.in
++++ libengine/emeraldengine.pc.in
+@@ -7,6 +7,7 @@
+ Description: Library for Emerald Engines
+ Version: @VERSION@
+ 
+-Requires: @EMERALD_REQUIRES@
+-Libs: @EMERALD_LIBS@
++Requires.private: @EMERALD_REQUIRES@
++Libs: -L${libdir} -lemeraldengine
++Libs.private: @EMERALD_LIBS@
+ Cflags: @EMERALD_CFLAGS@ -I${includedir}/emerald