Make sure that only one copy of the docs are installed (bug #143518). Remove the "x86?" for the psyco use flag as it is now in use.mask for all non-x86 arches.

Package-Manager: portage-2.1.1_pre5-r3

5 files changed, 49 insertions, 18 deletions

diff --git a/net-print/pkpgcounter/ChangeLog b/net-print/pkpgcounter/ChangeLog
index 24d162148941..e415d748b4e4 100644
--- a/net-print/pkpgcounter/ChangeLog
+++ b/net-print/pkpgcounter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/pkpgcounter
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pkpgcounter/ChangeLog,v 1.3 2006/02/16 15:02:01 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pkpgcounter/ChangeLog,v 1.4 2006/08/23 20:43:50 chutzpah Exp $
+
+  23 Aug 2006; Patrick McLean <chutzpah@gentoo.org> metadata.xml,
+  pkpgcounter-1.72.ebuild, pkpgcounter-1.80.ebuild:
+  Make sure that only one copy of the docs are installed (bug #143518). Remove
+  the "x86?" for the psyco use flag as it is now in use.mask for all non-x86
+  arches.
 
 *pkpgcounter-1.80 (16 Feb 2006)
 
diff --git a/net-print/pkpgcounter/Manifest b/net-print/pkpgcounter/Manifest
index eea08a810501..be366d342b34 100644
--- a/net-print/pkpgcounter/Manifest
+++ b/net-print/pkpgcounter/Manifest
@@ -1,18 +1,24 @@
-MD5 409e4849b2b5f7f2be7644209748e7ed ChangeLog 691
-RMD160 041190907cc700399288ac78ec4ecfabced271b5 ChangeLog 691
-SHA256 85f92c1c1e485da62403607ff790253edc7121fd7193e4705c24b6f5bdc2cb0a ChangeLog 691
+DIST pkpgcounter-1.72.tar.gz 164534
+DIST pkpgcounter-1.80.tar.gz 169191 RMD160 b4226cc74513c8bf493be6a3de91d420dd3a23fc SHA256 417b6733327f6ae7dc5cde3086c37eebc92ce549375ff71bb87ceaa89446ebc0
+EBUILD pkpgcounter-1.72.ebuild 789 RMD160 e452d50707de95ff5d8bf64647974ea4831a206f SHA1 0870321cebdb951959dd96f0426df1bc2fa4de19 SHA256 914d078f43f6539f4a6c7a4c89e1b572d23a2ebd36716527cafb0e4d51c38d11
+MD5 fa84510b9eb83e26c47ecc6f88dea80f pkpgcounter-1.72.ebuild 789
+RMD160 e452d50707de95ff5d8bf64647974ea4831a206f pkpgcounter-1.72.ebuild 789
+SHA256 914d078f43f6539f4a6c7a4c89e1b572d23a2ebd36716527cafb0e4d51c38d11 pkpgcounter-1.72.ebuild 789
+EBUILD pkpgcounter-1.80.ebuild 846 RMD160 03ee34eaecaf4b21de3aafae5f84ce8de71300b6 SHA1 58ea61691c071f2e68ce62593b0b1f02e2be4017 SHA256 090e1a42a7d34a534cf9af0e9aafb588e83f168cf6b9321fa46590aebb3bf013
+MD5 3a8968eb737d6222cbb00d4535a18216 pkpgcounter-1.80.ebuild 846
+RMD160 03ee34eaecaf4b21de3aafae5f84ce8de71300b6 pkpgcounter-1.80.ebuild 846
+SHA256 090e1a42a7d34a534cf9af0e9aafb588e83f168cf6b9321fa46590aebb3bf013 pkpgcounter-1.80.ebuild 846
+MISC ChangeLog 979 RMD160 d1836a28336b8ca4ca3cb7ab1a7b2c7e30c19719 SHA1 28aee9e0fe884fddde19297c4320ed6488886e92 SHA256 13bb3015658230d6b7e66ca432b495914a7b00f68ddcc47ae22d966ee13bef13
+MD5 b3370bd9b90cb66a7384f37acd83e27c ChangeLog 979
+RMD160 d1836a28336b8ca4ca3cb7ab1a7b2c7e30c19719 ChangeLog 979
+SHA256 13bb3015658230d6b7e66ca432b495914a7b00f68ddcc47ae22d966ee13bef13 ChangeLog 979
+MISC metadata.xml 525 RMD160 45afcbb8ab284b197336ccf864b650d964bb9d55 SHA1 7b996389e4ca557574ca1e2652426b42b60fc062 SHA256 a1a7e2bb3c8f712d0082db206aaecd6dac0e845bb6fbe8067ae9d04f480eb453
+MD5 1eca3eff9eac157865d0ab2c2055605c metadata.xml 525
+RMD160 45afcbb8ab284b197336ccf864b650d964bb9d55 metadata.xml 525
+SHA256 a1a7e2bb3c8f712d0082db206aaecd6dac0e845bb6fbe8067ae9d04f480eb453 metadata.xml 525
 MD5 4b3350797519d01a6b372bb5a87ccfcf files/digest-pkpgcounter-1.72 68
 RMD160 d7ca24973533d8804b387f292cdb6695107557a7 files/digest-pkpgcounter-1.72 68
 SHA256 69a359d6515c75ba4cfbfb6167fdcc7c7691d59f5fd0d921e8ebe92037b677c6 files/digest-pkpgcounter-1.72 68
 MD5 3041211e9b4b98097cd8bf07560819aa files/digest-pkpgcounter-1.80 250
 RMD160 b4d606b99a5a3051e84627f58dd0c2e6325935d5 files/digest-pkpgcounter-1.80 250
 SHA256 dffc3bc15de7744a610151f66541c54e0739638a3d1be825cc06e22b6b5c61ba files/digest-pkpgcounter-1.80 250
-MD5 c85acb443a7c6618093c4201bc67d465 metadata.xml 433
-RMD160 50fa71d695e1311ff213ee1ca31b6ec1be46432e metadata.xml 433
-SHA256 9c39b2ad0b45784eee5910b96b81e3554c1266a8fc7ddcd0113a84a47eaef58d metadata.xml 433
-MD5 266a06fb74a63ef814cd5b0f0aab032b pkpgcounter-1.72.ebuild 659
-RMD160 ba0cdee78e6874babdcaa15c8b391008abf970e4 pkpgcounter-1.72.ebuild 659
-SHA256 bc0cea817d78540be30f488b99380feff7eb567e513091dc9591b7283d45c6da pkpgcounter-1.72.ebuild 659
-MD5 32ee4eca556addf5e420293a849d7b29 pkpgcounter-1.80.ebuild 729
-RMD160 22d523c87866e41a2957e78378b1fddea50b5251 pkpgcounter-1.80.ebuild 729
-SHA256 aef6d4e106a40857d1ec71a83c9df18e867754ad2e3f966a48739e90ad73a42d pkpgcounter-1.80.ebuild 729
diff --git a/net-print/pkpgcounter/metadata.xml b/net-print/pkpgcounter/metadata.xml
index 2c613557d9a4..efc941ca63c5 100644
--- a/net-print/pkpgcounter/metadata.xml
+++ b/net-print/pkpgcounter/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
+	<email>chutzpah@gentoo.org</email>
+	<name>Patrick McLean</name>
+</maintainer>
+<maintainer>
 	<email>satya@gentoo.org</email>
 	<name>Christian Andreetta</name>
 </maintainer>
diff --git a/net-print/pkpgcounter/pkpgcounter-1.72.ebuild b/net-print/pkpgcounter/pkpgcounter-1.72.ebuild
index f33e78f3f539..9fe69dd53c6a 100644
--- a/net-print/pkpgcounter/pkpgcounter-1.72.ebuild
+++ b/net-print/pkpgcounter/pkpgcounter-1.72.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pkpgcounter/pkpgcounter-1.72.ebuild,v 1.2 2005/11/15 20:39:32 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pkpgcounter/pkpgcounter-1.72.ebuild,v 1.3 2006/08/23 20:43:50 chutzpah Exp $
 
 inherit distutils
 
@@ -16,3 +16,11 @@ IUSE=""
 
 DEPEND="virtual/python"
 RDEPEND="${DEPEND}"
+
+DOCS="BUGS NEWS README CREDITS PKG-INFO"
+
+src_install() {
+	distutils_src_install
+
+	rm -rf "${D}"/usr/share/doc/pkpgcounter
+}
diff --git a/net-print/pkpgcounter/pkpgcounter-1.80.ebuild b/net-print/pkpgcounter/pkpgcounter-1.80.ebuild
index 6037ee599bbc..95978f08240a 100644
--- a/net-print/pkpgcounter/pkpgcounter-1.80.ebuild
+++ b/net-print/pkpgcounter/pkpgcounter-1.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pkpgcounter/pkpgcounter-1.80.ebuild,v 1.2 2006/02/19 08:26:42 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pkpgcounter/pkpgcounter-1.80.ebuild,v 1.3 2006/08/23 20:43:50 chutzpah Exp $
 
 inherit distutils
 
@@ -17,7 +17,14 @@ IUSE="psyco"
 DEPEND="
 	virtual/python
 	dev-python/imaging
-	x86? ( psyco?  ( dev-python/psyco ) )
-	"
+	psyco? ( dev-python/psyco )"
 
 RDEPEND="${DEPEND}"
+
+DOCS="BUGS NEWS README CREDITS PKG-INFO"
+
+src_install() {
+	distutils_src_install
+
+	rm -rf "${D}"/usr/share/doc/pkpgcounter
+}