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.

(Portage version: 2.1.1_pre5-r3)

7 files changed, 101 insertions, 35 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/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}
 }