Make sure that docs are only installed to /usr/share/doc/${P}, and that there are no copies of the license installed (bug #143422). Make sure all uses of ${D} are quoted properly.

Package-Manager: portage-2.1.1_pre5-r3

8 files changed, 129 insertions, 63 deletions

diff --git a/net-print/pykota/ChangeLog b/net-print/pykota/ChangeLog
index 65d5708e8210..88716bb96a71 100644
--- a/net-print/pykota/ChangeLog
+++ b/net-print/pykota/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/pykota
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.15 2006/08/22 21:26:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.16 2006/08/24 14:36:03 chutzpah Exp $
+
+  24 Aug 2006; Patrick McLean <chutzpah@gentoo.org>
+  pykota-1.22_p1548.ebuild, pykota-1.23_p1869.ebuild,
+  pykota-1.23_p1869-r1.ebuild, pykota-1.23_p1874.ebuild,
+  pykota-1.24_p2166.ebuild, pykota-1.24_p2174.ebuild:
+  Make sure that docs are only installed to /usr/share/doc/${P}, and that
+  there are no copies of the license installed (bug #143422). Make sure all
+  uses of ${D} are quoted properly.
 
   22 Aug 2006; Patrick McLean <chutzpah@gentoo.org> metadata.xml,
   pykota-1.24_p2166.ebuild, pykota-1.24_p2174.ebuild:
diff --git a/net-print/pykota/Manifest b/net-print/pykota/Manifest
index dfdec830c774..831b72234795 100644
--- a/net-print/pykota/Manifest
+++ b/net-print/pykota/Manifest
@@ -3,34 +3,34 @@ DIST pykota-1.23_p1869.tar.bz2 1762719
 DIST pykota-1.23_p1874.tar.bz2 1762919
 DIST pykota-1.24_p2166.tar.bz2 1898631 RMD160 3579c6624c791d287437a398f76b5ff20956eee4 SHA256 2c205d148e9edf48515d01c4eb8c52f6f40c99b690f880488fe0b64d4cfa2bac
 DIST pykota-1.24_p2174.tar.bz2 1898668 RMD160 f1a10d4d770becff8ef607622dad50bdd163bb16 SHA256 5a3ce81f0669b550ee969523b52d1032c0b40f9c5c309889a0de857d1b619c95
-EBUILD pykota-1.22_p1548.ebuild 2149 RMD160 11fbee36356001815dde05e6ce175ba0c55577eb SHA1 38c4b675013ff67d7d85e84e28b42ea24b916005 SHA256 6f9d6cb34fbe4bfc35a59bed84601effcacb09ddc53f5ab73c9f48b77d2070d1
-MD5 f64b54087ff67cce8ef7c219a95e708e pykota-1.22_p1548.ebuild 2149
-RMD160 11fbee36356001815dde05e6ce175ba0c55577eb pykota-1.22_p1548.ebuild 2149
-SHA256 6f9d6cb34fbe4bfc35a59bed84601effcacb09ddc53f5ab73c9f48b77d2070d1 pykota-1.22_p1548.ebuild 2149
-EBUILD pykota-1.23_p1869-r1.ebuild 1283 RMD160 b037d19f6cf2bf7e89482cc626cb049e3ed91ec3 SHA1 c79e010bd49e01acd5603129cad7a5ef54315d4a SHA256 3b31d3fbf6df2e0683a5f4f796fb9bf296841bc52199adc4403de3f93f204196
-MD5 682673435b0f262ca0f6c37f9b365296 pykota-1.23_p1869-r1.ebuild 1283
-RMD160 b037d19f6cf2bf7e89482cc626cb049e3ed91ec3 pykota-1.23_p1869-r1.ebuild 1283
-SHA256 3b31d3fbf6df2e0683a5f4f796fb9bf296841bc52199adc4403de3f93f204196 pykota-1.23_p1869-r1.ebuild 1283
-EBUILD pykota-1.23_p1869.ebuild 1237 RMD160 ed264abdbdcc252d4e97dccde384bab28897efa3 SHA1 7079216786d0748edfbc83b62913d61f8d29281d SHA256 0719c7ec6e0f1a5d5321dfaa623e945c874215224b889cd5b04090f0e2fdf1bb
-MD5 9ab2ba534446a7c98d0c7ce6df98e233 pykota-1.23_p1869.ebuild 1237
-RMD160 ed264abdbdcc252d4e97dccde384bab28897efa3 pykota-1.23_p1869.ebuild 1237
-SHA256 0719c7ec6e0f1a5d5321dfaa623e945c874215224b889cd5b04090f0e2fdf1bb pykota-1.23_p1869.ebuild 1237
-EBUILD pykota-1.23_p1874.ebuild 1287 RMD160 4a3e09cc098ed0c15d551962f483617a3700171e SHA1 9e68b04e8a8647c6702e50a744570eee89664c3a SHA256 11b63a9f9234549bce1eb3919e37405626f09e34c2554dbfdd360c8f9a562424
-MD5 267bd4c4aa153c5b0187662bc99c9efa pykota-1.23_p1874.ebuild 1287
-RMD160 4a3e09cc098ed0c15d551962f483617a3700171e pykota-1.23_p1874.ebuild 1287
-SHA256 11b63a9f9234549bce1eb3919e37405626f09e34c2554dbfdd360c8f9a562424 pykota-1.23_p1874.ebuild 1287
-EBUILD pykota-1.24_p2166.ebuild 1381 RMD160 db5bbdb41a679a1febaab5fe5d508b9d5eaa9c5d SHA1 d1a73fff6b74c6d37ec50eb91a55f55a752f723e SHA256 2ce449987072975292e240bdacb2d6110d02604e2ad64ddcad4ee3d28cbde950
-MD5 758f340bfa9754f76fa2a22c20f0392c pykota-1.24_p2166.ebuild 1381
-RMD160 db5bbdb41a679a1febaab5fe5d508b9d5eaa9c5d pykota-1.24_p2166.ebuild 1381
-SHA256 2ce449987072975292e240bdacb2d6110d02604e2ad64ddcad4ee3d28cbde950 pykota-1.24_p2166.ebuild 1381
-EBUILD pykota-1.24_p2174.ebuild 1381 RMD160 964d225db23212866115c67d0de562f8eba7310d SHA1 31092bd7c9972b0415cd1818f4994938f9b5bb7c SHA256 6b222942839209ddb79945c7643bfafb56640eeb797b44e14473f7e63e0773d6
-MD5 89e020ff586cb0acedc672a298f2e377 pykota-1.24_p2174.ebuild 1381
-RMD160 964d225db23212866115c67d0de562f8eba7310d pykota-1.24_p2174.ebuild 1381
-SHA256 6b222942839209ddb79945c7643bfafb56640eeb797b44e14473f7e63e0773d6 pykota-1.24_p2174.ebuild 1381
-MISC ChangeLog 2809 RMD160 b7329854463ca14687622aa9c9e492fdc47a87b0 SHA1 52bbf17ac04fb168879a0d2c0e41c2df92edbee0 SHA256 39fab25c1adf4f5f437a8dfd8a6e602ca65e8dfd92769f6b6239124c7f5a852d
-MD5 d28bf1961d2038742ed34a767e326f59 ChangeLog 2809
-RMD160 b7329854463ca14687622aa9c9e492fdc47a87b0 ChangeLog 2809
-SHA256 39fab25c1adf4f5f437a8dfd8a6e602ca65e8dfd92769f6b6239124c7f5a852d ChangeLog 2809
+EBUILD pykota-1.22_p1548.ebuild 2433 RMD160 ae7aaf5b392e2796fc2aa8f51ac8f8964de969d5 SHA1 84ece424bde49a6ac6c3a3a00abe731453c5a0dd SHA256 ac0170e161b8567234031d1cb04c6e2d0874e4d6d989cf12f11212bf7812e072
+MD5 09f1b866f53f48ec514960d8aef6844a pykota-1.22_p1548.ebuild 2433
+RMD160 ae7aaf5b392e2796fc2aa8f51ac8f8964de969d5 pykota-1.22_p1548.ebuild 2433
+SHA256 ac0170e161b8567234031d1cb04c6e2d0874e4d6d989cf12f11212bf7812e072 pykota-1.22_p1548.ebuild 2433
+EBUILD pykota-1.23_p1869-r1.ebuild 1568 RMD160 19204161f8b44584c023797708449b6f2af5de49 SHA1 9e76b844e1586361ebd0983842cd271de423e201 SHA256 348dc9e53d6f9eec5c64cce5d4bc9dc4b5d4d037d434662c99cbc88056387a5c
+MD5 ea3cbab9f908e6da8585ba53a8502076 pykota-1.23_p1869-r1.ebuild 1568
+RMD160 19204161f8b44584c023797708449b6f2af5de49 pykota-1.23_p1869-r1.ebuild 1568
+SHA256 348dc9e53d6f9eec5c64cce5d4bc9dc4b5d4d037d434662c99cbc88056387a5c pykota-1.23_p1869-r1.ebuild 1568
+EBUILD pykota-1.23_p1869.ebuild 1522 RMD160 7af28195c3c714eac019e1291686967d27120719 SHA1 001202a2a8f30f103f4c2b19b7212a113466057a SHA256 5edf38fc37a2376a7a0e2138dce9f74242db415dc9dea1b74d94e1a855799e5c
+MD5 7aa7a8ca9c1d3b9570bc5d0c0ff8fd17 pykota-1.23_p1869.ebuild 1522
+RMD160 7af28195c3c714eac019e1291686967d27120719 pykota-1.23_p1869.ebuild 1522
+SHA256 5edf38fc37a2376a7a0e2138dce9f74242db415dc9dea1b74d94e1a855799e5c pykota-1.23_p1869.ebuild 1522
+EBUILD pykota-1.23_p1874.ebuild 1572 RMD160 76cd207848a3f2090d0525b125b12c71e8e6e48f SHA1 26cae85ebdec589737474160e54ea9fbfd80bad6 SHA256 8c87c7cfae477a6a97468ac754aff13311d0a86ae9c4e21683e74afd08fdd2b6
+MD5 c1e956fd3e4a6370c304c3da996fc47c pykota-1.23_p1874.ebuild 1572
+RMD160 76cd207848a3f2090d0525b125b12c71e8e6e48f pykota-1.23_p1874.ebuild 1572
+SHA256 8c87c7cfae477a6a97468ac754aff13311d0a86ae9c4e21683e74afd08fdd2b6 pykota-1.23_p1874.ebuild 1572
+EBUILD pykota-1.24_p2166.ebuild 1653 RMD160 848a88bb09fa842dd4c1e3494ef4a69f10546279 SHA1 ed6df5a76abafe05d7e4ead735c048b8b0722dfe SHA256 c4413299553026fa8bb8ad80d6eab531218c93c965b0c0e9bc5f985e21be4c45
+MD5 f1f6fa7779ddcf16b1683ab4c6136357 pykota-1.24_p2166.ebuild 1653
+RMD160 848a88bb09fa842dd4c1e3494ef4a69f10546279 pykota-1.24_p2166.ebuild 1653
+SHA256 c4413299553026fa8bb8ad80d6eab531218c93c965b0c0e9bc5f985e21be4c45 pykota-1.24_p2166.ebuild 1653
+EBUILD pykota-1.24_p2174.ebuild 1651 RMD160 aafa3fe27b1673ac875090b7eabb521862797b64 SHA1 264600213c41994267eaf12529a5a05b82078c59 SHA256 c364d7021de444b6866c42629a8f1fcf2833a36126f84f69c9288d3a83bd51a5
+MD5 fe2d03415d35e107c6405de8f347b868 pykota-1.24_p2174.ebuild 1651
+RMD160 aafa3fe27b1673ac875090b7eabb521862797b64 pykota-1.24_p2174.ebuild 1651
+SHA256 c364d7021de444b6866c42629a8f1fcf2833a36126f84f69c9288d3a83bd51a5 pykota-1.24_p2174.ebuild 1651
+MISC ChangeLog 3213 RMD160 52d4d1a1a5d3df3281b99d7b09deebfa9f942e36 SHA1 d4c5c9b6d5cf24f00da80288ecfa3289b9ce6cc2 SHA256 5bfb16ccf48dac6ba43c79f45ede147bd422a76d2a89bb506063e704b10ff933
+MD5 5b5027c1c946ae15cf369a7d6fd20147 ChangeLog 3213
+RMD160 52d4d1a1a5d3df3281b99d7b09deebfa9f942e36 ChangeLog 3213
+SHA256 5bfb16ccf48dac6ba43c79f45ede147bd422a76d2a89bb506063e704b10ff933 ChangeLog 3213
 MISC metadata.xml 564 RMD160 3d46420f0b0f924f1736a239e657cc85e70f74d6 SHA1 16bc6724afdc0d9be67812bedeb5a3f17fdfd1f7 SHA256 95a6b4b866d1590fb22fe6e30ab3c2adbf72d4374557b785a0cd5ee573656112
 MD5 419a54bab4aad61ed02bf8591ab2d299 metadata.xml 564
 RMD160 3d46420f0b0f924f1736a239e657cc85e70f74d6 metadata.xml 564
diff --git a/net-print/pykota/pykota-1.22_p1548.ebuild b/net-print/pykota/pykota-1.22_p1548.ebuild
index 13870fa12ec6..fc9ca4c4f1ba 100644
--- a/net-print/pykota/pykota-1.22_p1548.ebuild
+++ b/net-print/pykota/pykota-1.22_p1548.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/pykota/pykota-1.22_p1548.ebuild,v 1.3 2006/06/08 10:56:06 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.22_p1548.ebuild,v 1.4 2006/08/24 14:36:03 chutzpah Exp $
 
 #==============================================================================
 inherit python eutils distutils
@@ -23,6 +23,7 @@ KEYWORDS="~x86"
 SLOT="0"
 #--------------------------------------------------------------------------
 #S="${WORKDIR}/${MY_P}"
+DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
 #==============================================================================
 src_unpack() {
 	unpack ${A}
@@ -35,15 +36,23 @@ src_unpack() {
 }
 #==============================================================================
 src_install() {
-	mkdir -p ${D}/etc/${PN}
+	mkdir -p "${D}"/etc/${PN}
 	python_version
 	distutils_src_install
 	#cups backend ----------------------------------------------
-	mkdir -p ${D}/usr/lib/cups/backend
+	mkdir -p "${D}"/usr/lib/cups/backend
 	dosym /usr/share/pykota/cupspykota /usr/lib/cups/backend/cupspykota
 	#extra docs: inits -----------------------------------------
-	init_dir=/usr/share/doc/${PN}/initscripts
+	init_dir=/usr/share/doc/${P}/initscripts
 	insinto ${init_dir}
-	cp -pPR initscripts/* ${D}/${init_dir}
+	cp -pPR initscripts/* "${D}"/${init_dir}
+
+	for doc in ${DOCS}; do
+		rm -f "${D}"/usr/share/doc/${PN}/${doc}
+	done
+
+	rm -f "${D}"/usr/share/doc/${PN}/{LICENSE,COPYING}
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${P}
+	rmdir "${D}"/usr/share/doc/${PN}
 }
 
diff --git a/net-print/pykota/pykota-1.23_p1869-r1.ebuild b/net-print/pykota/pykota-1.23_p1869-r1.ebuild
index 2023a31acb4e..5a8b0d870474 100644
--- a/net-print/pykota/pykota-1.23_p1869-r1.ebuild
+++ b/net-print/pykota/pykota-1.23_p1869-r1.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/pykota/pykota-1.23_p1869-r1.ebuild,v 1.3 2006/06/08 10:56:06 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.23_p1869-r1.ebuild,v 1.4 2006/08/24 14:36:03 chutzpah Exp $
 
 inherit python eutils distutils
 
@@ -23,16 +23,26 @@ RDEPEND="${DEPEND}"
 KEYWORDS="~x86"
 SLOT="0"
 
+DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
+
 src_install() {
-	mkdir -p ${D}/etc/${PN}
+	mkdir -p "${D}"/etc/${PN}
 	python_version
 	distutils_src_install
 	#cups backend ----------------------------------------------
-	mkdir -p ${D}/usr/lib/cups/backend
+	mkdir -p "${D}"/usr/lib/cups/backend
 	dosym /usr/share/pykota/cupspykota /usr/lib/cups/backend/cupspykota
 	#extra docs: inits -----------------------------------------
-	init_dir=/usr/share/doc/${PN}/initscripts
+	init_dir=/usr/share/doc/${P}/initscripts
 	insinto ${init_dir}
-	cp -pPR initscripts/* ${D}/${init_dir}
+	cp -pPR initscripts/* "${D}"/${init_dir}
+
+	for doc in ${DOCS}; do
+		rm -f "${D}"/usr/share/doc/${PN}/${doc}
+	done
+
+	rm -f "${D}"/usr/share/doc/${PN}/{LICENSE,COPYING}
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${P}
+	rmdir "${D}"/usr/share/doc/${PN}
 }
 
diff --git a/net-print/pykota/pykota-1.23_p1869.ebuild b/net-print/pykota/pykota-1.23_p1869.ebuild
index fe21878ca5c7..5ed8a18afbfd 100644
--- a/net-print/pykota/pykota-1.23_p1869.ebuild
+++ b/net-print/pykota/pykota-1.23_p1869.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/pykota/pykota-1.23_p1869.ebuild,v 1.3 2006/06/08 10:56:06 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.23_p1869.ebuild,v 1.4 2006/08/24 14:36:03 chutzpah Exp $
 
 inherit python eutils distutils
 
@@ -21,16 +21,26 @@ DEPEND="dev-lang/python
 KEYWORDS="~x86"
 SLOT="0"
 
+DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
+
 src_install() {
-	mkdir -p ${D}/etc/${PN}
+	mkdir -p "${D}"/etc/${PN}
 	python_version
 	distutils_src_install
 	#cups backend ----------------------------------------------
-	mkdir -p ${D}/usr/lib/cups/backend
+	mkdir -p "${D}"/usr/lib/cups/backend
 	dosym /usr/share/pykota/cupspykota /usr/lib/cups/backend/cupspykota
 	#extra docs: inits -----------------------------------------
-	init_dir=/usr/share/doc/${PN}/initscripts
+	init_dir=/usr/share/doc/${P}/initscripts
 	insinto ${init_dir}
-	cp -pPR initscripts/* ${D}/${init_dir}
+	cp -pPR initscripts/* "${D}"/${init_dir}
+
+	for doc in ${DOCS}; do
+		rm -f "${D}"/usr/share/doc/${PN}/${doc}
+	done
+
+	rm -f "${D}"/usr/share/doc/${PN}/{LICENSE,COPYING}
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${P}
+	rmdir "${D}"/usr/share/doc/${PN}
 }
 
diff --git a/net-print/pykota/pykota-1.23_p1874.ebuild b/net-print/pykota/pykota-1.23_p1874.ebuild
index efa4360b9724..6b6013c089e4 100644
--- a/net-print/pykota/pykota-1.23_p1874.ebuild
+++ b/net-print/pykota/pykota-1.23_p1874.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/pykota/pykota-1.23_p1874.ebuild,v 1.4 2006/06/08 10:56:06 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.23_p1874.ebuild,v 1.5 2006/08/24 14:36:03 chutzpah Exp $
 
 inherit python eutils distutils
 
@@ -23,16 +23,26 @@ RDEPEND="${DEPEND}"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
+DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
+
 src_install() {
-	mkdir -p ${D}/etc/${PN}
+	mkdir -p "${D}"/etc/${PN}
 	python_version
 	distutils_src_install
 	#cups backend ----------------------------------------------
-	mkdir -p ${D}/usr/lib/cups/backend
+	mkdir -p "${D}"/usr/lib/cups/backend
 	dosym /usr/share/pykota/cupspykota /usr/lib/cups/backend/cupspykota
 	#extra docs: inits -----------------------------------------
-	init_dir=/usr/share/doc/${PN}/initscripts
+	init_dir=/usr/share/doc/${P}/initscripts
 	insinto ${init_dir}
-	cp -pPR initscripts/* ${D}/${init_dir}
+	cp -pPR initscripts/* "${D}"/${init_dir}
+
+	for doc in ${DOCS}; do
+		rm -f "${D}"/usr/share/doc/${PN}/${doc}
+	done
+
+	rm -f "${D}"/usr/share/doc/${PN}/{LICENSE,COPYING}
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${P}
+	rmdir "${D}"/usr/share/doc/${PN}
 }
 
diff --git a/net-print/pykota/pykota-1.24_p2166.ebuild b/net-print/pykota/pykota-1.24_p2166.ebuild
index a07ad4ea560d..6494fad6874e 100644
--- a/net-print/pykota/pykota-1.24_p2166.ebuild
+++ b/net-print/pykota/pykota-1.24_p2166.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/pykota/pykota-1.24_p2166.ebuild,v 1.2 2006/08/22 21:26:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.24_p2166.ebuild,v 1.3 2006/08/24 14:36:03 chutzpah Exp $
 
 inherit python eutils distutils
 
@@ -21,22 +21,32 @@ DEPEND="dev-lang/python
 	snmp?     ( net-analyzer/net-snmp =dev-python/pysnmp-3.4.2 )
 	xml?      ( dev-python/jaxml )
 	"
+
 RDEPEND="${DEPEND}"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
+DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
+
 src_install() {
-	echo ${S}
-	mkdir -p ${D}/etc/${PN}
+	mkdir -p "${D}"/etc/${PN}
 	python_version
 	distutils_src_install
 	#cups backend ----------------------------------------------
-	mkdir -p ${D}/usr/lib/cups/backend
+	mkdir -p "${D}"/usr/lib/cups/backend
 	dosym /usr/share/pykota/cupspykota /usr/lib/cups/backend/cupspykota
 	#extra docs: inits -----------------------------------------
-	init_dir=/usr/share/doc/${PN}/initscripts
+	init_dir=/usr/share/doc/${P}/initscripts
 	insinto ${init_dir}
-	cp -pPR initscripts/* ${D}/${init_dir}
+	cp -pPR initscripts/* "${D}"/${init_dir}
+
+	for doc in ${DOCS}; do
+		rm -f "${D}"/usr/share/doc/${PN}/${doc}
+	done
+
+	rm -f "${D}"/usr/share/doc/${PN}/{LICENSE,COPYING}
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${P}
+	rmdir "${D}"/usr/share/doc/${PN}
 }
 
diff --git a/net-print/pykota/pykota-1.24_p2174.ebuild b/net-print/pykota/pykota-1.24_p2174.ebuild
index 8330765d5ac6..6751b75f64c1 100644
--- a/net-print/pykota/pykota-1.24_p2174.ebuild
+++ b/net-print/pykota/pykota-1.24_p2174.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/pykota/pykota-1.24_p2174.ebuild,v 1.2 2006/08/22 21:26:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.24_p2174.ebuild,v 1.3 2006/08/24 14:36:03 chutzpah Exp $
 
 inherit python eutils distutils
 
@@ -19,24 +19,33 @@ DEPEND="dev-lang/python
 	postgres? ( dev-db/postgresql dev-db/pygresql )
 	sqlite?   ( =dev-python/pysqlite-2* )
 	snmp?     ( net-analyzer/net-snmp =dev-python/pysnmp-3.4.2 )
-	xml?      ( dev-python/jaxml )
-	"
+	xml?      ( dev-python/jaxml )"
+
 RDEPEND="${DEPEND}"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
+DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
+
 src_install() {
-	echo ${S}
-	mkdir -p ${D}/etc/${PN}
+	mkdir -p "${D}"/etc/${PN}
 	python_version
 	distutils_src_install
 	#cups backend ----------------------------------------------
-	mkdir -p ${D}/usr/lib/cups/backend
+	mkdir -p "${D}"/usr/lib/cups/backend
 	dosym /usr/share/pykota/cupspykota /usr/lib/cups/backend/cupspykota
 	#extra docs: inits -----------------------------------------
-	init_dir=/usr/share/doc/${PN}/initscripts
+	init_dir=/usr/share/doc/${P}/initscripts
 	insinto ${init_dir}
-	cp -pPR initscripts/* ${D}/${init_dir}
+	cp -pPR initscripts/* "${D}"/${init_dir}
+
+	for doc in ${DOCS}; do
+		rm -f "${D}"/usr/share/doc/${PN}/${doc}
+	done
+
+	rm -f "${D}"/usr/share/doc/${PN}/{LICENSE,COPYING}
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${P}
+	rmdir "${D}"/usr/share/doc/${PN}
 }