Import Gentoo Prefix mods. KEYWORDS, deps, offset paths to configure, bug 415509

Package-Manager: portage-2.1.10.60/cvs/Linux x86_64

4 files changed, 27 insertions, 40 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index fb92f35f309a..4ca8b48d99d8 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.276 2012/05/06 18:57:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.277 2012/05/22 13:57:32 darkside Exp $
+
+  22 May 2012; Jeremy Olexa <darkside@gentoo.org> pidgin-2.10.3.ebuild,
+  pidgin-2.10.3-r100.ebuild:
+  Import Gentoo Prefix mods. KEYWORDS, deps, offset paths to configure, bug
+  415509
 
   06 May 2012; Mark Loeser <halcy0n@gentoo.org> pidgin-2.10.3.ebuild:
   Stable for ppc64; bug #408117
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 41a1f4541384..e0435e15552e 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pidgin-2.10.0-gold.patch 1003 RMD160 947502ee3c055b80ba35b0fe0d4e5fa26f44b6ae SHA1 2f01a80b9391e15083e009c492ece3771094d46a SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb
 AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 RMD160 76311be8823e809128e5862a2d4019682040b89d SHA1 7582f01f672117a094666c08d03fc114d1184eb6 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab
 AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4
@@ -8,24 +5,7 @@ AUX port-to-farstream-v5.patch 15456 RMD160 a93f3f061c8a3c4eafe8f614f4e656e5a056
 DIST pidgin-2.10.1.tar.bz2 9961580 RMD160 f73c5540fd01f62ae2a0ae236436f06770a896ef SHA1 045ed0fd7dfedada6e082e7a4564648b55950064 SHA256 2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8
 DIST pidgin-2.10.3.tar.bz2 9970676 RMD160 10af4caee9f22a251f867e3befebcc659e2b42f3 SHA1 7dfeabdb1ade4311c91ac9c9f988276f67ead6ee SHA256 0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b
 EBUILD pidgin-2.10.1.ebuild 6976 RMD160 4aa2f340d571ad5feb3042c2bae348a8ce43cef1 SHA1 9cb92c5221dfb9372aac558148f51eedb6836d38 SHA256 85cee9a3f427a6c72cb8620df6cdedbc77357ecb70eb0fe53dc9c8bfe0259ae4
-EBUILD pidgin-2.10.3-r100.ebuild 6993 RMD160 a11d47db6dd27f55d5eca8dbd5a9a9d9151987d6 SHA1 359b2c5fc979d122f395edd204e90f2f4c564e56 SHA256 b8a2af6ca4935e67b8071fd87bea8fff98470e92034dce7c637ff1cb54dd41d4
-EBUILD pidgin-2.10.3.ebuild 6917 RMD160 5f1a9818567bdd9edb09b54a3ad263c0dc5ef85e SHA1 d3a37818a1f06c0a7a22900410d544532af532c6 SHA256 0618f302e2f91785cb6bee667cc2b51899d868c4a4b3643b0e6ad951cf5613b4
-MISC ChangeLog 39031 RMD160 2d56d0add61e076a6d608073af26673c2c641875 SHA1 6231f77d015085af3e6092f33c7ff577987e826f SHA256 5a939655f19363e94528638c2c31fc5779a5ef3a983ba933c9836e8a99a7a2f9
+EBUILD pidgin-2.10.3-r100.ebuild 7107 RMD160 7b545fa9d1c0e3e6d1ab7d81ffe5de10cdac14cc SHA1 e344535dc95d8f1818fe272c517ad91bcf3e33d3 SHA256 272728e29b5e2dc40f5c848ea3df60cfbef696f2a28e9aeaabb290795278722a
+EBUILD pidgin-2.10.3.ebuild 7030 RMD160 8cafb250a56f2cf767cd3e1243f975e04e67c09d SHA1 7cb027181f873fcca6c9ea353758b39567fb71d2 SHA256 bcb7d7e7a4f9a0d04c1479736f6b459dae070daa08f7cd871dfb5c5e3ac765b1
+MISC ChangeLog 39219 RMD160 f1ce03e1cefa877ef8ddd6bb9b4841c60cbf2e42 SHA1 f1c953d1d1d8a0297f2b67577970013d4c5a4693 SHA256 b7f7aedb1254448e52e649913e2a2ac5c4a60e842071ece2633994585f3112f1
 MISC metadata.xml 1311 RMD160 b0374914c2205f8e96bbcaf82aa7669c0568a3c1 SHA1 4dfd73f2ce52af88aa122d170d97d1e41803f7c7 SHA256 a0253264c64bdd1a4623db7f223cae50450dc8577d74748c25974ca909b80875
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPpsnqAAoJEPTTRK0uRVaNqRwQAJg2qOERMKJvmTB/CU0NnZnF
-8JU2psKgJVCukuprlxQFMOg4VfSpeW8wfTLNH8irbTb2f3FWtV4NN6F09eEjgTau
-174disibEX4NTD23f2Ra9SFib6zXeXSjsCyK0fj5zqbAwRSFf8LhsqJMixDc9tcn
-e/2zfD0HXYqVa1xUvixhgQCk//JNAbnKbY67ueVvqCrlKzYc2wTKJ78fWrw224Kd
-BZ+X9DF2lDypjmHUTgRdjw78rKi0lmcYO9+IJ2uLXY/y5ZkW9fhaHonlW4twfdjo
-ic3nFrVdSY6RmELf0HOVmf0giNDb2Ha8MOo3X7C7fwpUomvEhgzqBFkh60g2g3C1
-XHptkJyBspOTba1tltj6b5IgtA+1XEStBaEd9DEp2/Pki3P1LB8g2hortc+RGCj8
-ZyoMZBJQTMGSo4/IC35+G7hT4/pHwYGfuxGUuIjHjwcOSlJbcqIUMZ/TBej9m5Rx
-2uzmeJVbEyjJBaFOtblR05P2ciiLZb7JQH1i7u6vsgWnen5x09Bk9gZVwmAlDQ0c
-7uf1FoMcCOSmMFjncsusyEfIcDaZILRroh2pD2zbtixBbFfK0yWW/fiESZxtU395
-Oj/9AN4HyCOI0J96PcORpc52r5pLk81xrc0kEf587j0W6LXLq1gUNxhf7zRPLrjH
-NetEQRbXLT79lr1qlT84
-=gh/h
------END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.10.3-r100.ebuild b/net-im/pidgin/pidgin-2.10.3-r100.ebuild
index 22cbab3f62bb..0031ee875d17 100644
--- a/net-im/pidgin/pidgin-2.10.3-r100.ebuild
+++ b/net-im/pidgin/pidgin-2.10.3-r100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.3-r100.ebuild,v 1.2 2012/05/04 06:22:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.3-r100.ebuild,v 1.3 2012/05/22 13:57:32 darkside Exp $
 
 EAPI=4
 
@@ -13,10 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
 
 # dbus requires python to generate C code for dbus bindings (thus DEPEND only).
 # finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
@@ -31,7 +32,7 @@ RDEPEND="
 		dbus? ( <dev-lang/python-3 )
 		python? ( <dev-lang/python-3 ) )
 	gtk? (
-		>=x11-libs/gtk+-2.10:2
+		>=x11-libs/gtk+-2.10:2[aqua=]
 		x11-libs/libSM
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		spell? ( >=app-text/gtkspell-2.0.2:2 )
@@ -159,8 +160,8 @@ src_configure() {
 	if use gnutls; then
 		einfo "Disabling NSS, using GnuTLS"
 		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=/usr/$(get_libdir)"
+		myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
+		myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
 	else
 		einfo "Disabling GnuTLS, using NSS"
 		myconf+=" --enable-gnutls=no --enable-nss=yes"
@@ -197,10 +198,10 @@ src_configure() {
 		$(use_enable networkmanager nm) \
 		$(use_enable zeroconf avahi) \
 		$(use_enable idn) \
-		--with-system-ssl-certs="/etc/ssl/certs/" \
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
 		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
 		--disable-mono \
-		--x-includes=/usr/include/X11 \
+		--x-includes="${EPREFIX}"/usr/include/X11 \
 		${myconf}
 		#$(use_enable mono) \
 }
@@ -212,7 +213,7 @@ src_install() {
 		# implementations that are not complient with new hicolor theme yet, #323355
 		local pixmapdir
 		for d in 16 22 32 48; do
-			pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
 			mkdir "${pixmapdir}" || die
 			pushd "${pixmapdir}" >/dev/null || die
 			for f in ../status/*; do
diff --git a/net-im/pidgin/pidgin-2.10.3.ebuild b/net-im/pidgin/pidgin-2.10.3.ebuild
index 976108f2d7c6..81af0465eb55 100644
--- a/net-im/pidgin/pidgin-2.10.3.ebuild
+++ b/net-im/pidgin/pidgin-2.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.3.ebuild,v 1.8 2012/05/06 18:57:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.3.ebuild,v 1.9 2012/05/22 13:57:32 darkside Exp $
 
 EAPI=4
 
@@ -13,10 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
 
 # dbus requires python to generate C code for dbus bindings (thus DEPEND only).
 # finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
@@ -31,7 +32,7 @@ RDEPEND="
 		dbus? ( <dev-lang/python-3 )
 		python? ( <dev-lang/python-3 ) )
 	gtk? (
-		>=x11-libs/gtk+-2.10:2
+		>=x11-libs/gtk+-2.10:2[aqua=]
 		x11-libs/libSM
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		spell? ( >=app-text/gtkspell-2.0.2:2 )
@@ -157,8 +158,8 @@ src_configure() {
 	if use gnutls; then
 		einfo "Disabling NSS, using GnuTLS"
 		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=/usr/$(get_libdir)"
+		myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
+		myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
 	else
 		einfo "Disabling GnuTLS, using NSS"
 		myconf+=" --enable-gnutls=no --enable-nss=yes"
@@ -195,10 +196,10 @@ src_configure() {
 		$(use_enable networkmanager nm) \
 		$(use_enable zeroconf avahi) \
 		$(use_enable idn) \
-		--with-system-ssl-certs="/etc/ssl/certs/" \
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
 		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
 		--disable-mono \
-		--x-includes=/usr/include/X11 \
+		--x-includes="${EPREFIX}"/usr/include/X11 \
 		${myconf}
 		#$(use_enable mono) \
 }
@@ -210,7 +211,7 @@ src_install() {
 		# implementations that are not complient with new hicolor theme yet, #323355
 		local pixmapdir
 		for d in 16 22 32 48; do
-			pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
 			mkdir "${pixmapdir}" || die
 			pushd "${pixmapdir}" >/dev/null || die
 			for f in ../status/*; do