diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 20:47:24 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 20:47:24 +0000 |
| commit | 7a2dfcc78f047cbc65332c234e00915721e854c7 (patch) | |
| tree | 0db602aa93a13492e1a0b9c4c477a952f59233ee /x11-wm/emerald | |
| parent | remove old (diff) | |
| download | gentoo-2-7a2dfcc78f047cbc65332c234e00915721e854c7.tar.gz gentoo-2-7a2dfcc78f047cbc65332c234e00915721e854c7.tar.bz2 gentoo-2-7a2dfcc78f047cbc65332c234e00915721e854c7.zip | |
Use Requires.private and Libs.private instead of Requires and Libs wrt #380197 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/emerald')
| -rw-r--r-- | x11-wm/emerald/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/emerald/emerald-0.8.4-r2.ebuild | 4 | ||||
| -rw-r--r-- | x11-wm/emerald/files/emerald-0.8.4-pkgconfig-pollution.patch | 12 |
3 files changed, 21 insertions, 2 deletions
diff --git a/x11-wm/emerald/ChangeLog b/x11-wm/emerald/ChangeLog index 4af814d4f963..184e8c3cdd8d 100644 --- 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/emerald-0.8.4-r2.ebuild b/x11-wm/emerald/emerald-0.8.4-r2.ebuild index 68a1b5b1bacb..a65c2e83bfe7 100644 --- 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 index 000000000000..047d8dfad786 --- /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 |