Added keyword ~amd64.

Merged prefix support with keywords ~ppc-aix ~x86-interix ~x86-linux ~x86-solaris.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 17 insertions, 11 deletions

diff --git a/dev-util/confix-wrapper/ChangeLog b/dev-util/confix-wrapper/ChangeLog
index 00eee4c7e272..b6f64dd7b23e 100644
--- a/dev-util/confix-wrapper/ChangeLog
+++ b/dev-util/confix-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/confix-wrapper
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix-wrapper/ChangeLog,v 1.3 2008/06/16 08:38:51 haubi Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix-wrapper/ChangeLog,v 1.4 2009/10/16 08:16:21 haubi Exp $
+
+  16 Oct 2009; Michael Haubenwallner <haubi@gentoo.org>
+  confix-wrapper-0.ebuild:
+  Added keyword ~amd64.
+  Merged prefix support with keywords ~ppc-aix ~x86-interix ~x86-linux
+  ~x86-solaris.
 
   16 Jun 2008; Michael Haubenwallner <haubi@gentoo.org>
   confix-wrapper-0.ebuild:
diff --git a/dev-util/confix-wrapper/Manifest b/dev-util/confix-wrapper/Manifest
index 8e2275e34527..ebb016f2a049 100644
--- a/dev-util/confix-wrapper/Manifest
+++ b/dev-util/confix-wrapper/Manifest
@@ -1,3 +1,3 @@
-EBUILD confix-wrapper-0.ebuild 816 RMD160 acd08b441f06a473d4dfa7b7f985998b31bce18f SHA1 736d1be920a4086eb0cdfe12c8a67030104a778a SHA256 5b1bcfa47d72ec2fbe047f26259e2b2a0a7879a8cf98fce8909314f859d6813c
-MISC ChangeLog 633 RMD160 40153875512ca6d2946b07c89360ff114078c7c2 SHA1 805c4e9bf5bd0bb22f5cc4cc85b1d9f849f83c93 SHA256 67b1147e7a235b1b33ecc866543013c8c36da4b39dbe765734bc9ee30b8ef1af
+EBUILD confix-wrapper-0.ebuild 888 RMD160 c40f27c4c8e5599361bf90e47761a13fe0c627f6 SHA1 345b9e5449c2f8859c175c1efb0fc38adaff03bc SHA256 cfaf69323930c4062d6193d5aae4663dd16b50de03da823c7a09a932874db34f
+MISC ChangeLog 828 RMD160 24ab660e381881c519b32ddce76a3ee35782feed SHA1 fde3fcc5875d821e795a45d4ff83d939853d9d43 SHA256 482ce2c3d8f8c2ba3205752e69caf260166496cbe2fd5c5220ddb7eab1d95e3f
 MISC metadata.xml 310 RMD160 8705c05dd91101641c0c967f040cf8c6de36f5e0 SHA1 255e1d97639f0f1698d667d23273797d05ac034d SHA256 05b48b7bd20b100b293a45dd84f1d9e7beeb52409327248b0d5ad242e0d9d2e5
diff --git a/dev-util/confix-wrapper/confix-wrapper-0.ebuild b/dev-util/confix-wrapper/confix-wrapper-0.ebuild
index 048bfb2b2cfd..215488950912 100644
--- a/dev-util/confix-wrapper/confix-wrapper-0.ebuild
+++ b/dev-util/confix-wrapper/confix-wrapper-0.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix-wrapper/confix-wrapper-0.ebuild,v 1.2 2008/06/16 08:38:51 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix-wrapper/confix-wrapper-0.ebuild,v 1.3 2009/10/16 08:16:21 haubi Exp $
 
 DESCRIPTION="Wrapper to select either confix1.py or confix2.py"
 HOMEPAGE="http://confix.sourceforge.net"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-interix ~x86-linux ~x86-solaris"
 IUSE=""
 
 src_install() {
 	dodir /usr/bin
-	cat >> "${D}"usr/bin/confix <<EOF
-#! /bin/sh
+	cat >> "${ED:-${D}}"usr/bin/confix <<EOF
+#! ${EPREFIX:-}/bin/sh
 confixpy=
 if [ -f ./Confix2.dir ]; then
 	confixpy=confix2.py
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
index 0b715563bcd1..e16456f3df12 100644
--- a/dev-util/confix/Manifest
+++ b/dev-util/confix/Manifest
@@ -5,7 +5,7 @@ AUX 2.1.0/fast-install.patch 15068 RMD160 2896a18ac2cc205d8e131cfb0185e4b92d6576
 AUX 2.1.0/jni-hpux.patch 461 RMD160 ceb81eab19f5ad68cbfea6e0a222396e568ee04f SHA1 1d106059b0c5af376dc63fa39c95a98d27acd7f7 SHA256 7b53466e987f738a34adaca8cbd8266265f43985ba7bddb02f100f068ca946e3
 AUX 2.1.0/private-headers.patch 1685 RMD160 b15e70c2f3bad3205b6ae6b6627dc9167eb46945 SHA1 e0614dc7a80f573cd4c5119775d7e2929d90ffe6 SHA256 a47b77fb37677b7e3faa8d5e5d15c9cadf1546103f069c84b75f28dcda0fc873
 DIST Confix-2.1.0.tar.bz2 977383 RMD160 f83dc809b674cf7cfc78ad2a6a843c8bba9cc43a SHA1 837a8db0ca59c451289661f012eb227ccc8fda08 SHA256 ba4c4278e6bf1bf74503935fb394a2c045d122afebde52d863b040fba6e7104f
-EBUILD confix-2.1.0-r3.ebuild 1685 RMD160 8c107011693a1e489fdbaffb1cae647bec2a84a0 SHA1 8dfd8daa0664900c442f9d46108a139f1916d4a1 SHA256 e869f84d3a5bb17dd5063f515d6740e9636a0da49626e44ee7d8ff75a40c47b5
+EBUILD confix-2.1.0-r3.ebuild 1738 RMD160 e4f1594e0a67813bad2d538095640dc403c88ef0 SHA1 8732a3a81821ab5292cbbb94aa1970779288d234 SHA256 5a5650256f941c1613bff6a7c3e3ecde16c857f656c4d4dc4732cec7d128aaa6
 EBUILD confix-2.1.0.ebuild 1487 RMD160 4bb8e31cfc4bb639c03f4b3d81799e770dae3931 SHA1 86548c173643c70888cff9838466fb4ea7d0ddda SHA256 d3fa0ea2e60e8304555d284eff41bad742722c75df39f1ba85ad13f2552691f7
-MISC ChangeLog 1684 RMD160 f83d6bae203a1a13c7146e58d9bed3b0d7d4bbda SHA1 d46fb8f1f98a5d4cb4c9b147763209af43891a97 SHA256 7f8c2ff792459cb99b1a0957086b0422486fd7e93aa0b453600798d170616d2c
+MISC ChangeLog 1863 RMD160 82b6bf4eaf82a8f8753899ddbfd0cfc0b29fa280 SHA1 ef03291d80dfe5ecca265417625098cbadf7f580 SHA256 866b1ed5f445bf720686b5f66338d0eca5281d2b2a466c0ef70dbad74eac62f8
 MISC metadata.xml 310 RMD160 8705c05dd91101641c0c967f040cf8c6de36f5e0 SHA1 255e1d97639f0f1698d667d23273797d05ac034d SHA256 05b48b7bd20b100b293a45dd84f1d9e7beeb52409327248b0d5ad242e0d9d2e5