Add more DEPENDs for mark in bug 161442

Package-Manager: portage-2.1.2.7

5 files changed, 16 insertions, 75 deletions

diff --git a/net-print/pykota/ChangeLog b/net-print/pykota/ChangeLog
index 8688942bd419..897ef335b1bd 100644
--- a/net-print/pykota/ChangeLog
+++ b/net-print/pykota/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/pykota
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.20 2007/03/14 16:29:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/ChangeLog,v 1.21 2007/05/13 09:28:29 genstef Exp $
+
+  13 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  -pykota-1.24_p2174.ebuild, pykota-1.25_p2437.ebuild:
+  Add more DEPENDs for mark in bug 161442
 
 *pykota-1.25_p2437 (14 Mar 2007)
 
diff --git a/net-print/pykota/Manifest b/net-print/pykota/Manifest
index e3deb6f16562..4cd02fc14e71 100644
--- a/net-print/pykota/Manifest
+++ b/net-print/pykota/Manifest
@@ -1,24 +1,16 @@
-DIST pykota-1.24_p2174.tar.bz2 1898668 RMD160 f1a10d4d770becff8ef607622dad50bdd163bb16 SHA1 69d0fc58963acb1d7cd19e6d2c9662c407d0dbc9 SHA256 5a3ce81f0669b550ee969523b52d1032c0b40f9c5c309889a0de857d1b619c95
 DIST pykota-1.25_p2437.tar.bz2 1704330 RMD160 f11e46433bca09381018c301dd27e5e94672002b SHA1 db2fb846c6f6956a6766f783025f5a88b7f6d199 SHA256 b0d26ecaa2a0eaece67eb1040b0adcf4ab44f7a0d76380af20d4936afe7f7927
-EBUILD pykota-1.24_p2174.ebuild 1671 RMD160 c7840671ae2ef205da301d0b547054002f074f46 SHA1 273ac584c0fa962519d8223bcc53c871264a7115 SHA256 99134706cea44b23fc459dd433667455daca81f0c44a7e6c91379bb7cbafaf7d
-MD5 ef07e04562ceb6614cc45c8f85e468f5 pykota-1.24_p2174.ebuild 1671
-RMD160 c7840671ae2ef205da301d0b547054002f074f46 pykota-1.24_p2174.ebuild 1671
-SHA256 99134706cea44b23fc459dd433667455daca81f0c44a7e6c91379bb7cbafaf7d pykota-1.24_p2174.ebuild 1671
-EBUILD pykota-1.25_p2437.ebuild 1685 RMD160 24bd3c8758e1cf30a404e71d65f5f7d6f8be5e75 SHA1 6f0c04346e72ec8e2f518cf044f9d6441934b4f2 SHA256 377a058184022267d2078ccfe9c8bfab1ab44c2f57178471f5d197fc8217f0b6
-MD5 fab1edbaa8ea41ae9ffdc9827314230c pykota-1.25_p2437.ebuild 1685
-RMD160 24bd3c8758e1cf30a404e71d65f5f7d6f8be5e75 pykota-1.25_p2437.ebuild 1685
-SHA256 377a058184022267d2078ccfe9c8bfab1ab44c2f57178471f5d197fc8217f0b6 pykota-1.25_p2437.ebuild 1685
-MISC ChangeLog 3850 RMD160 a30074061382b112801e92db344083eec325f0b8 SHA1 58e0cbcad8db6f6eb4cc240b95954ee28a3dd2ab SHA256 64e97beb0e175f07242e78bea31e23b61930bd0794427a7b1981f9bd96906e3d
-MD5 303fc71802992c06a1f36f0b9b82d08d ChangeLog 3850
-RMD160 a30074061382b112801e92db344083eec325f0b8 ChangeLog 3850
-SHA256 64e97beb0e175f07242e78bea31e23b61930bd0794427a7b1981f9bd96906e3d ChangeLog 3850
+EBUILD pykota-1.25_p2437.ebuild 1726 RMD160 6310c67e1027bc602d20e9f1d5dd034b253a2edf SHA1 7688cea354266856968cc864ba311999b51b68bb SHA256 30be7a6d4739e32be903030628e399c18b2d505019870d90f45e8f57f9c9daed
+MD5 38daf88e4d5ed6a12228523f31f6fc9b pykota-1.25_p2437.ebuild 1726
+RMD160 6310c67e1027bc602d20e9f1d5dd034b253a2edf pykota-1.25_p2437.ebuild 1726
+SHA256 30be7a6d4739e32be903030628e399c18b2d505019870d90f45e8f57f9c9daed pykota-1.25_p2437.ebuild 1726
+MISC ChangeLog 4001 RMD160 eb71e724ad563022daab3dde15d513a6eaa4d6a8 SHA1 c753dcee94df9b8c0a05aa4da9ac1c7b6d782984 SHA256 042cf65aa992ec6c811ce148d0cd9767d9638b510b03b3b36f0d9ae273c539ce
+MD5 8f1a0a4af044e839a914750dc0507b1b ChangeLog 4001
+RMD160 eb71e724ad563022daab3dde15d513a6eaa4d6a8 ChangeLog 4001
+SHA256 042cf65aa992ec6c811ce148d0cd9767d9638b510b03b3b36f0d9ae273c539ce ChangeLog 4001
 MISC metadata.xml 500 RMD160 3db14a7d1cf29454e94ec0600cb46e6ee064d173 SHA1 87fbe11b345db7fc5e1592a2cafce5688f575570 SHA256 56cc20f89272726ec03987ead60cfdf9ac39efad27e63749e239f990c73a13cd
 MD5 52102152f5a9199612373570a1f2166d metadata.xml 500
 RMD160 3db14a7d1cf29454e94ec0600cb46e6ee064d173 metadata.xml 500
 SHA256 56cc20f89272726ec03987ead60cfdf9ac39efad27e63749e239f990c73a13cd metadata.xml 500
-MD5 501d59b2930355e060ad35ef39622907 files/digest-pykota-1.24_p2174 259
-RMD160 1f75a267b6b0924ca76bf96563b43d386c06ae5a files/digest-pykota-1.24_p2174 259
-SHA256 cbc7f265953849cf1bde85c2dec10ea8d866e2c530c17f12ebe8968ce2c6c5d2 files/digest-pykota-1.24_p2174 259
 MD5 493faebde64a77b079e76400cd751958 files/digest-pykota-1.25_p2437 259
 RMD160 258795ff4457e11c604cfc1929db977f2d550f47 files/digest-pykota-1.25_p2437 259
 SHA256 43574e27ed0e0de120c34d8e3f45ed6836f54f0661a1da833c9209996dcad079 files/digest-pykota-1.25_p2437 259
diff --git a/net-print/pykota/files/digest-pykota-1.24_p2174 b/net-print/pykota/files/digest-pykota-1.24_p2174
deleted file mode 100644
index 3011f705b128..000000000000
--- a/net-print/pykota/files/digest-pykota-1.24_p2174
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2b5c53daa165bc20f774f1eab144c47c pykota-1.24_p2174.tar.bz2 1898668
-RMD160 f1a10d4d770becff8ef607622dad50bdd163bb16 pykota-1.24_p2174.tar.bz2 1898668
-SHA256 5a3ce81f0669b550ee969523b52d1032c0b40f9c5c309889a0de857d1b619c95 pykota-1.24_p2174.tar.bz2 1898668
diff --git a/net-print/pykota/pykota-1.24_p2174.ebuild b/net-print/pykota/pykota-1.24_p2174.ebuild
deleted file mode 100644
index 95cdb0667e9a..000000000000
--- a/net-print/pykota/pykota-1.24_p2174.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.5 2006/12/11 11:11:48 aross Exp $
-
-inherit python eutils distutils
-
-DESCRIPTION="Flexible print quota and accounting package for use with CUPS."
-SRC_URI="http://www.gentoo.org/~satya/packages/pykota/${P}.tar.bz2"
-HOMEPAGE="http://www.pykota.com"
-LICENSE="GPL-2"
-
-IUSE="ldap mysql postgres snmp sqlite snmp xml"
-
-DEPEND="dev-lang/python
-	dev-python/egenix-mx-base
-	net-print/pkpgcounter
-	ldap?     ( dev-python/python-ldap )
-	mysql?    ( dev-python/mysql-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 )"
-
-RDEPEND="${DEPEND}"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DOCS="README MANIFEST.in TODO SECURITY NEWS CREDITS FAQ"
-
-src_install() {
-	mkdir -p "${D}"/etc/${PN}
-	python_version
-	distutils_src_install
-	#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/${P}/initscripts
-	insinto ${init_dir}
-	cp -pPR initscripts/* "${D}"/${init_dir}
-
-	# 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}
-	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.25_p2437.ebuild b/net-print/pykota/pykota-1.25_p2437.ebuild
index d3cf932dbfe9..3c76aae58520 100644
--- a/net-print/pykota/pykota-1.25_p2437.ebuild
+++ b/net-print/pykota/pykota-1.25_p2437.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.1 2007/03/14 16:29:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pykota/pykota-1.25_p2437.ebuild,v 1.2 2007/05/13 09:28:29 genstef Exp $
 
 S=${WORKDIR}/${PN}
 
@@ -17,6 +17,8 @@ IUSE="ldap mysql postgres snmp sqlite snmp xml"
 DEPEND="dev-lang/python
 	dev-python/egenix-mx-base
 	net-print/pkpgcounter
+	dev-python/chardet
+	dev-python/pkipplib
 	ldap?     ( dev-python/python-ldap )
 	mysql?    ( dev-python/mysql-python )
 	postgres? ( dev-db/postgresql dev-db/pygresql )