General cleanup and fix documentation location, bug 295314

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

3 files changed, 48 insertions, 21 deletions

diff --git a/net-print/pykota/ChangeLog b/net-print/pykota/ChangeLog
index 52825cb9c407..9de5837f14b9 100644
--- a/net-print/pykota/ChangeLog
+++ b/net-print/pykota/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/pykota
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.26 2010/06/17 21:58:40 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.27 2011/06/02 17:57:12 dilfridge Exp $
+
+  02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  pykota-1.25_p2437-r1.ebuild:
+  General cleanup and fix documentation location, bug 295314
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org>
   pykota-1.25_p2437-r1.ebuild:
diff --git a/net-print/pykota/Manifest b/net-print/pykota/Manifest
index e0794d007d85..cdd83c72e9a2 100644
--- a/net-print/pykota/Manifest
+++ b/net-print/pykota/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST pykota-1.25_p2437.tar.bz2 1704330 RMD160 f11e46433bca09381018c301dd27e5e94672002b SHA1 db2fb846c6f6956a6766f783025f5a88b7f6d199 SHA256 b0d26ecaa2a0eaece67eb1040b0adcf4ab44f7a0d76380af20d4936afe7f7927
-EBUILD pykota-1.25_p2437-r1.ebuild 1820 RMD160 d684d599e19f770244c43df7197946a84277ac83 SHA1 d78319459d3cb4c501bf3e3925b3175dd795db40 SHA256 2aa47954716284e4b83ad8f81411b322b508f035d94c452a0ef9863bbaf23f2a
-MISC ChangeLog 4843 RMD160 cfd1502c675d1abb4a052e39ad7cd97ef1daa235 SHA1 d713c2e5499d13c8d8574f04781b1f66ea1e6574 SHA256 b7da2c11e81a352223d222f14b80ecf40fdf66225c717fee8f482f2f8720956c
+EBUILD pykota-1.25_p2437-r1.ebuild 1833 RMD160 d6e092de27bbe316572876840850802524a1c6d0 SHA1 d405fc2b1108982142f7bcfc87bd46f8c2d70f18 SHA256 d671c3822608339299f842682304624e911075e24bf48767bf470b704c89692c
+MISC ChangeLog 4995 RMD160 43e8edc9789a040515c98a66ccc8160b614d0193 SHA1 992d34940fb5b105b6bbbe85497ec0aa2f954054 SHA256 90832ff492087adef8b2310f1a31d4d4f036f19eb9c889fb6f94a1213afcd142
 MISC metadata.xml 427 RMD160 14e37f92bd061a0656aedf02bf73e86de573390d SHA1 af1a789a217fdf9918a334ddf3539eebc6373763 SHA256 0ba8afd5307d6a4e5aeb0ae19d754460edcd913dd632632721de2e93cf79043d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJN588CAAoJENwGBM22xffenzIP/1/G+5a8lWYS9jKoran/4qUJ
+ZxrVsqAx+uixVvXzLCQQH2lWXYytQWlMTYNcqActW5NT2QwCj35H0XTpjAHhok2z
+EPYJupy3v/TfrvnTPAPykpkdlGFVStgQVFsK+uXC3aChZ1qX7sW+c3X77Ybi3lbA
+iLYcdJF9TKvf/8ZXgpYpYqndm8xQhqbZDzUWPVGi8BGY6xNjeg3ytmh0/n1QCkdD
+qDOSVoLeSSxk6buu3N4F0MSHy876JtMoxZkWZhZlFJ8L48eD+RHky5d+Noy/vCSK
+d8A6F7MWgNCqG2KKqm7wtafqciIIWiOyuJ4u6d8PNC2jKKnvN2JFWJ4ZwmufvatI
+sU/Kk6IHMWXAS+tRxEsK/sdjNqvrXxVk9wAzgCHPs2feB8rSklZhYB/48AO+C3+F
+g5v2RmdNi5GTUhac/QkP0yCFQPWUujHtd9aFA8xXYyDbPFndPTQvKAwISbj0zUSv
+/lwngVNPUzQ1QirXQCWKdCMDYjqMcmGGvPLfgRPa/nm4appzQtUfnxXB/z7/ev6e
+sy6PpuA0MSyelO9slApLnLmyJd8iUhovs+y0gcQnoDNX+sdjHlEBPRdLlhe1aWbf
+ks3FSJr013JdfAtCluVE5Wy+hUDNel1exhjW0Usw3zp1fEgpmNPGXYl5aY2ana/y
+kNRzcS/JxR9FZDnyu04k
+=0q6E
+-----END PGP SIGNATURE-----
diff --git a/net-print/pykota/pykota-1.25_p2437-r1.ebuild b/net-print/pykota/pykota-1.25_p2437-r1.ebuild
index afb3ee31cd6a..604c56bdc332 100644
--- a/net-print/pykota/pykota-1.25_p2437-r1.ebuild
+++ b/net-print/pykota/pykota-1.25_p2437-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.25_p2437-r1.ebuild,v 1.6 2010/10/31 18:57:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.25_p2437-r1.ebuild,v 1.7 2011/06/02 17:57:12 dilfridge Exp $
 
-EAPI="3"
+EAPI=3
 PYTHON_DEPEND="2"
 
 inherit distutils
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
+DOCS="README TODO SECURITY NEWS CREDITS FAQ"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -39,24 +39,27 @@ pkg_setup() {
 }
 
 src_install() {
-	mkdir -p "${D}"/etc/${PN}
+	dodir /etc/${PN} || die
 	distutils_src_install
-	#cups backend ----------------------------------------------
-	mkdir -p "${D}"$(cups-config --serverbin)/backend
-	dosym /usr/share/pykota/cupspykota $(cups-config --serverbin)/backend/cupspykota
-	#extra docs: inits -----------------------------------------
-	init_dir=/usr/share/doc/${P}/initscripts
-	insinto ${init_dir}
-	cp -pPR initscripts/* "${D}"/${init_dir}
+
+	# cups backend ----------------------------------------------
+
+	dodir $(cups-config --serverbin)/backend || die
+	dosym /usr/share/pykota/cupspykota $(cups-config --serverbin)/backend/cupspykota || die
+
+	# extra docs: inits -----------------------------------------
+
+	init_dir="/usr/share/doc/${PF}/initscripts"
+	insinto "${init_dir}"
+	doins -r initscripts/* || die
 
 	# Fixes permissions for bug 155865
 	chmod 700 "${D}"/usr/share/pykota/cupspykota
 
 	for doc in ${DOCS}; do
-		rm -f "${D}"/usr/share/doc/${PN}/${doc}
+		rm "${D}"/usr/share/doc/${PN}/${doc} || die
 	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}
+	rm "${D}"/usr/share/doc/${PN}/{LICENSE,COPYING} || die
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
+	rmdir "${D}"/usr/share/doc/${PN} || die
 }