Import Gentoo Prefix mods. Add KEYWORDS, small fix to etc file, call eprefixify

Package-Manager: portage-2.1.10.7/cvs/Linux i686

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 2436cf5402de12058bd9f8d55abfbc37ac6c0146..f9a1cacdc9e6987aa837a5d2e841426927dc841a 100644 (file)
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.142 2011/07/18 14:52:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.143 2011/08/05 19:57:46 darkside Exp $
+
+  05 Aug 2011; Jeremy Olexa <darkside@gentoo.org> layman-2.0.0_rc1-r1.ebuild:
+  Import Gentoo Prefix mods. Add KEYWORDS, small fix to etc file, call
+  eprefixify
 
   18 Jul 2011; Christian Ruppert <idl0r@gentoo.org> layman-2.0.0_rc1-r1.ebuild,
   layman-9999.ebuild:

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 67864c72b0594bb0e005be91fc6f4f5a456938a5..9fa3ab967b5c6a0e6d096882b35a832077a28bf8 100644 (file)
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX layman-1.4.2-python-compatbility-fix.patch 7866 RMD160 4a83751b0548ab6ca8402babc86bf4cba9cb2f56 SHA1 70b4598cc2d0b3cecd63b17f36cdf83ad111b5a6 SHA256 6fc94c2954e66119817601fa072042c982def676f41a21bf164bd97d47025add
 AUX layman-2.0.0_rc1-fix-mistracking-success.patch 2698 RMD160 90003540b90f66de32e62ab3b8c82ed226643369 SHA1 ba08b23a7f51978b33ba02acff97cf8c0c86b78d SHA256 723dcd1c8574e9c1cfbb098c4b866f41d7e42833202202adfd9e6bee3efda156
 DIST layman-1.4.1.tar.gz 59960 RMD160 01cf082089c346696df52960412ed26ce06afe4a SHA1 62470af3569b84fbef5368a69337c320e5236010 SHA256 6dfa2a99b6ec4ee2f7a0a9f1e293dbb1bf2a52e408098aebd5031d93f8c4f248
@@ -8,18 +5,7 @@ DIST layman-1.4.2.tar.gz 60655 RMD160 e8144dcbd9800164aeae96c485ff58b389845dfe S
 DIST layman-2.0.0_rc1.tar.gz 70796 RMD160 d2d377b4930c8c630939bf929bdc609744d9689e SHA1 4fa9ade163d0c2b1c4f7fda3223da4f6c46d067c SHA256 20587f6410d544a70616f24705ea5dbdacc17e929109e307083d14d272dcbb02
 EBUILD layman-1.4.1.ebuild 2220 RMD160 f4099ff91ec3629415ca840684ad585aa44fc765 SHA1 269ea0ea367b76fce597a90d55f2650337011ae9 SHA256 2fe3c6c4e8d20ad1c9506b0a414d7b2bc4a4e153931089bbbbe9d49f24b9f1d5
 EBUILD layman-1.4.2-r2.ebuild 2350 RMD160 aa857fcce59b2e7edb5a261626f63fcf09fa3e6a SHA1 b2e72bf5a44c7e1fe4fb824a86d95c886218fbf5 SHA256 c5399f0f4be804cbe1054c366655d88e34814fecb68c28434e4929e9b9464c01
-EBUILD layman-2.0.0_rc1-r1.ebuild 2331 RMD160 6a96248a146225a2de3485140acbc8281d214a9c SHA1 40789f4e912abc4154c72dc1bc680778ea552c9c SHA256 bf5eae7c8fd9c720f131d2f9013749c5ccc784fcd316448cc386c98fdf73f29b
+EBUILD layman-2.0.0_rc1-r1.ebuild 2591 RMD160 437aa3ad1187601bb48f632164cc3c6c1af4c2eb SHA1 f4368780bb58721051e9bb1b1d8a8125dfb28687 SHA256 f36916685fbb29a2ac2da42ea967ab463df5cbdc095264c4b1b2542043b56786
 EBUILD layman-9999.ebuild 2361 RMD160 38d97ace2dde9295222cb8965c878880ea66b1c8 SHA1 e3bd7d24810984d6ddf2aad4df2d25f0dc52f714 SHA256 e8a86240a09599ff2f70aff55cb861b190ca8004245afbf4433e17f14b412880
-MISC ChangeLog 21243 RMD160 93591335ce04b6c57e7ab7e6048efa7acdeca2bc SHA1 174635b17b00391299cbd9b34f6fabfc3bc920cb SHA256 a699afee8c3387ccdbbe513d3ac34345a8db0b60e50f44f03902a2b79e10713c
+MISC ChangeLog 21409 RMD160 338f4b64c4d065a8dfe64b026b7206ad4edaea47 SHA1 156ce71d62edf78981a795d63a1ff130cb79e694 SHA256 659e03fa8f671a2d0a0ff399edff8b64156f4f0e3e4117d4ab00d035d4a49f50
 MISC metadata.xml 756 RMD160 3659553fed97aec8d38202e4e8753c9fba845493 SHA1 914504bda21647e11d258f2b2e6e955b8571e455 SHA256 04c1d9b81309254232aabeedc973e1f4c9f7300fdeeb95d364846f4c98bc347c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCAAGBQJOJEjPAAoJEMOx0zmdw4Z1KYoIALY1jBy44ZI3ck/DIpVvmqY5
-MIKC4L5htHClnm1lvvjR0WKQOt8K9obsOHLwLe/p/LJ4XeMLsDQT97WSicHL9t36
-DV0FxnPsja8espThV8bHZlHDBQ4gLBdGpwaTsI+AEkYwz7XlzSOvw201CMyQSq2Q
-mibvAphhCFTYm79knYqyydqmTGOnWwCqbFs8uO39N4foonUuZPNH196IHQLmMESc
-Y7A9+WcpLHynTgh20fZSjCm7OF7QDl4Y2+xe8Tn1sTUHmolA91RaQAiGd9NCnQrv
-z7wpo6UMy+id34gaysxcj8oJsUB5lfUsWOn1c8Gay/S7WG3q/DKobc+pbYJJmeI=
-=4Nia
------END PGP SIGNATURE-----

diff --git a/app-portage/layman/layman-2.0.0_rc1-r1.ebuild b/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
index 3b42f349e87534f11003eb7f1ea67576a29a5924..bc8544f626ba794b2a903d6cae92f68da70365dd 100644 (file)
--- a/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
+++ b/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc1-r1.ebuild,v 1.4 2011/07/18 14:52:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc1-r1.ebuild,v 1.5 2011/08/05 19:57:46 darkside Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
 PYTHON_DEPEND="2:2.6"
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 
-inherit eutils distutils
+inherit eutils distutils prefix
 
 DESCRIPTION="Tool to manage Gentoo overlays"
 HOMEPAGE="http://layman.sourceforge.net/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs git mercurial subversion test"
 
 COMMON_DEPS="dev-lang/python[xml]"
@@ -37,6 +37,8 @@ RESTRICT_PYTHON_ABIS="2.4 3.*"
 
 src_prepare() {
        epatch "${FILESDIR}/${P}-fix-mistracking-success.patch"
+       sed -i -e 's#/var/lib/layman#@GENTOO_PORTAGE_EPREFIX@/var/lib/layman#' etc/layman.cfg || die
+       eprefixify etc/layman.cfg
 }
 
 src_test() {