version bump

(Portage version: 2.0.51.19)

10 files changed, 120 insertions, 68 deletions

diff --git a/net-print/foomatic-db/ChangeLog b/net-print/foomatic-db/ChangeLog
index 21ce0fca843f..e480c7f63a81 100644
--- a/net-print/foomatic-db/ChangeLog
+++ b/net-print/foomatic-db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/foomatic-db
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.26 2005/06/06 22:31:57 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.27 2005/06/06 22:42:16 lanius Exp $
+
+*foomatic-db-20050606 (06 Jun 2005)
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
+  +foomatic-db-20050606.ebuild:
+  version bump
 
   06 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
   -foomatic-db-20031018.ebuild, -foomatic-db-20031231.ebuild,
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 8fd2a4ef8d08..68526799ef91 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2754c61e88f76ec0ba3eaa1908fbcf8c foomatic-db-20040302.ebuild 1404
+MD5 0bfeec9afab8cc61b61dcd24909f7437 foomatic-db-20050606.ebuild 1402
 MD5 0bfeec9afab8cc61b61dcd24909f7437 foomatic-db-20041220.ebuild 1402
 MD5 36ab3a2db48316d5e5dfad227a79c2a8 ChangeLog 3315
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 663216887676d82c4cb8a2483f26e3ea files/digest-foomatic-db-20040302 155
 MD5 41ff1e00ded5cca40749e4b960e1f1f1 files/digest-foomatic-db-20041220 155
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCpM7revY57Fted3ERAkPUAKCzp0sDIUL2VWI/FP24QjU4WaScxACfYeXw
-LQLPVL6X0cbX0xxYRbIO+cs=
-=civQ
------END PGP SIGNATURE-----
+MD5 e7cfdb3e785bbdd23884cdc735f1742f files/digest-foomatic-db-20050606 155
diff --git a/net-print/foomatic-db/files/digest-foomatic-db-20050606 b/net-print/foomatic-db/files/digest-foomatic-db-20050606
new file mode 100644
index 000000000000..f3ae21abb4f8
--- /dev/null
+++ b/net-print/foomatic-db/files/digest-foomatic-db-20050606
@@ -0,0 +1,2 @@
+MD5 bfdee630d0b9c77d5076a7f6d16edc9c foomatic-db-20050606.tar.gz 538528
+MD5 e790e508a7a7e8da298f4b5eda4c67d8 foomatic-filters-ppds-20050606.tar.gz 2912399
diff --git a/net-print/foomatic-db/foomatic-db-20050606.ebuild b/net-print/foomatic-db/foomatic-db-20050606.ebuild
new file mode 100644
index 000000000000..c40a2d0c471b
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-20050606.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20050606.ebuild,v 1.1 2005/06/06 22:42:16 lanius Exp $
+
+DESCRIPTION="Foomatic printer database"
+HOMEPAGE="http://www.linuxprinting.org/foomatic"
+SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz
+	ppds? ( http://www.linuxprinting.org/download/foomatic/foomatic-filters-ppds-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+IUSE="cups ppds"
+
+DEPEND="dev-libs/libxml2
+	net-misc/wget
+	net-misc/curl
+	net-print/foomatic-filters
+	net-print/foomatic-db-engine"
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_compile() {
+	econf || die
+	rm db/source/driver/stp.xml
+
+	if use ppds ; then
+		cd ../foomatic-filters-ppds-${PV}
+		rm -f `find . -name "*gimp-print*" `
+		rm -f `find . -name "*hpijs*" `
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	chmod -R 644 ${D}/usr/share/foomatic/db/
+	chmod 755 ${D}/usr/share/foomatic/db/
+	chmod 755 ${D}/usr/share/foomatic/db/source
+	chmod 755 ${D}/usr/share/foomatic/db/source/{driver,opt,printer}
+
+	if use ppds ; then
+		cd ../foomatic-filters-ppds-${PV}
+		./install -d ${D} -p /usr -z
+		if use cups ; then
+			dodir /usr/share/cups/model
+			dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
+		fi
+	fi
+}
diff --git a/net-print/gtklp/ChangeLog b/net-print/gtklp/ChangeLog
index 26440ab58445..63012db70f8c 100644
--- a/net-print/gtklp/ChangeLog
+++ b/net-print/gtklp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/gtklp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/ChangeLog,v 1.16 2005/01/05 16:12:45 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/ChangeLog,v 1.17 2005/06/06 22:44:36 lanius Exp $
+
+*gtklp-1.0d (06 Jun 2005)
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> -gtklp-0.9m.ebuild,
+  +gtklp-1.0d.ebuild:
+  version bump
 
   05 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org> gtklp-0.9p.ebuild:
   Added to ~amd64, bug #76247
diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest
index 33104e7e8ff9..f74526ef9286 100644
--- a/net-print/gtklp/Manifest
+++ b/net-print/gtklp/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a2ae6998c0151f0d999fa667e3218c72 gtklp-0.9p.ebuild 1153
-MD5 2680ed2fa331fbe344260555e451a2b1 gtklp-0.9m.ebuild 1059
+MD5 bd8aa7b4795aeb24ee07f342a58f212e gtklp-1.0d.ebuild 1135
 MD5 9a1760f505d2ec1519f45e75c91f1190 ChangeLog 2315
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 bb0214e75296c077c0a305b4096c803e files/digest-gtklp-0.9m 66
 MD5 3021ef15adb0dbab1dc9262e26c71139 files/digest-gtklp-0.9p 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB3BMnZ/iYVBmujdURAkT4AJ9uTkMkQ6pIvRZ3xt3uipbCK3WtHQCffQud
-exBM+0ILmo511b3c5buqWEI=
-=hDEz
------END PGP SIGNATURE-----
+MD5 4fd76e2df308a5c25d23efac634af30a files/digest-gtklp-1.0d 67
diff --git a/net-print/gtklp/files/digest-gtklp-0.9m b/net-print/gtklp/files/digest-gtklp-0.9m
deleted file mode 100644
index 4766c7f434d7..000000000000
--- a/net-print/gtklp/files/digest-gtklp-0.9m
+++ /dev/null
@@ -1 +0,0 @@
-MD5 127063ddd6f92338b34f4c91cf8b01b9 gtklp-0.9m.src.tar.gz 537815
diff --git a/net-print/gtklp/files/digest-gtklp-1.0d b/net-print/gtklp/files/digest-gtklp-1.0d
new file mode 100644
index 000000000000..b2379b57b1aa
--- /dev/null
+++ b/net-print/gtklp/files/digest-gtklp-1.0d
@@ -0,0 +1 @@
+MD5 eacea48c91360bb20133238ce1377359 gtklp-1.0d.src.tar.gz 1328798
diff --git a/net-print/gtklp/gtklp-0.9m.ebuild b/net-print/gtklp/gtklp-0.9m.ebuild
deleted file mode 100644
index 0739d2d76326..000000000000
--- a/net-print/gtklp/gtklp-0.9m.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-0.9m.ebuild,v 1.9 2005/01/05 16:12:45 sekretarz Exp $
-
-inherit libtool
-
-DESCRIPTION="A GUI for cupsd"
-SRC_URI="http://www.stud.uni-hannover.de/~sirtobi/gtklp/files/${P}.src.tar.gz"
-HOMEPAGE="http://www.stud.uni-hannover.de/~sirtobi/gtklp"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="GPL-2"
-IUSE="nls ssl"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=net-print/cups-1.1.7
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	elibtoolize
-
-	local myconf
-
-	use nls \
-		&& myconf="${myconf} --with-included-gettext" \
-		|| myconf="${myconf} --without-included-gettext"
-
-	use ssl \
-		&& myconf="${myconf} --enable-ssl" \
-		|| myconf="${myconf} --disable-ssl"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "parallel make failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-
-	use nls || rm -rf ${D}/usr/share/locale
-}
diff --git a/net-print/gtklp/gtklp-1.0d.ebuild b/net-print/gtklp/gtklp-1.0d.ebuild
new file mode 100644
index 000000000000..ce36ff043911
--- /dev/null
+++ b/net-print/gtklp/gtklp-1.0d.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.0d.ebuild,v 1.1 2005/06/06 22:44:36 lanius Exp $
+
+inherit libtool
+
+DESCRIPTION="A GUI for cupsd"
+SRC_URI="mirror://sourceforge/gtklp/${P}.src.tar.gz"
+HOMEPAGE="http://gtklp.sourceforge.net"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+LICENSE="GPL-2"
+IUSE="gtk2 nls ssl"
+
+DEPEND="!gtk2? ( =x11-libs/gtk+-1.2* )
+	gtk2? ( >=x11-libs/gtk+-2 )
+	>=net-print/cups-1.1.7
+	nls? ( sys-devel/gettext )
+	ssl? ( dev-libs/openssl )"
+
+src_compile() {
+	elibtoolize
+
+	local myconf
+
+	# nls fix
+	sed -i -e "s:#include <cups/language.h>:#ifndef _LOCALE_H\n#define _LOCALE_H\n#endif\n#include <cups/language.h>:" libgtklp/libgtklp.h
+
+	# package uses gtk2 by default, has switch to request gtk1
+	use gtk2 \
+		&& myconf="${myconf} --disable-gtk1" \
+		|| myconf="${myconf} --enable-gtk1"
+
+	econf \
+		${myconf} \
+		$(use_enable nls) \
+		$(use_enable ssl) \
+		|| die "configure failed"
+	emake || die "parallel make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS || die
+
+	use nls || rm -rf ${D}/usr/share/locale
+}