Add more DEPENDs for mark in bug 161442

(Portage version: 2.1.2.7)

4 files changed, 8 insertions, 59 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/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 )