9 files changed, 23 insertions, 137 deletions
diff --git a/net-print/gtklp/ChangeLog b/net-print/gtklp/ChangeLog
index 3c0f4af93441..614f6fc20af6 100644
--- a/net-print/gtklp/ChangeLog
+++ b/net-print/gtklp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2005/09/20 03:30:29 dang Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/ChangeLog,v 1.21 2006/02/04 21:56:42 vanquirius Exp $
+
+*gtklp-1.1.0 (04 Feb 2006)
+
+  04 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -gtklp-1.0d.ebuild,
+  -gtklp-1.0f.ebuild, -gtklp-1.0g.ebuild, +gtklp-1.1.0.ebuild:
+  1.1.0 version bump for bug 121592. Thanks to Christian Schlotter <again at
+  gmx dot de>. Christian notes that the nls sed fix has been sent upstream.
 
 *gtklp-1.0g-r1 (20 Sep 2005)
 
diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest
index 17c18ff9adaf..767e47fbd5b5 100644
--- a/net-print/gtklp/Manifest
+++ b/net-print/gtklp/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e74e04dfc82bd3be0cd5a56f6d1487e9 gtklp-1.0g-r1.ebuild 993
-MD5 b95bfe037c8a5eb4be95dc8a8af7a38c gtklp-1.0f.ebuild 1230
-MD5 a2ae6998c0151f0d999fa667e3218c72 gtklp-0.9p.ebuild 1153
-MD5 813daceb2c528ce7ab01158d72e805e8 gtklp-1.0g.ebuild 1222
-MD5 391b24dce74b6c892078b223bb01ba28 gtklp-1.0d.ebuild 1230
-MD5 1d74b6672b87216a61746ea14beb4672 ChangeLog 2831
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 5d726451500116140779bd987c8a1dc6 ChangeLog 3148
 MD5 3021ef15adb0dbab1dc9262e26c71139 files/digest-gtklp-0.9p 66
-MD5 4fd76e2df308a5c25d23efac634af30a files/digest-gtklp-1.0d 67
-MD5 d89a62afde24d6a31984edc709573046 files/digest-gtklp-1.0f 67
-MD5 4870554eafab18c3e7fb847f39d0cb79 files/digest-gtklp-1.0g 67
 MD5 4870554eafab18c3e7fb847f39d0cb79 files/digest-gtklp-1.0g-r1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDL4JoomPajV0RnrERAiqnAJ4uWFRhRQ2Q3fFwUVgs6eEutqfM/QCfQKmp
-2ziLI+YzojF/pv2wynblHVs=
-=IR4M
------END PGP SIGNATURE-----
+MD5 2f50ee42433b9e82c86525152b315f80 files/digest-gtklp-1.1.0 68
+MD5 a2ae6998c0151f0d999fa667e3218c72 gtklp-0.9p.ebuild 1153
+MD5 e74e04dfc82bd3be0cd5a56f6d1487e9 gtklp-1.0g-r1.ebuild 993
+MD5 fb589468aee3bbff473282504af9abc6 gtklp-1.1.0.ebuild 989
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/net-print/gtklp/files/digest-gtklp-1.0d b/net-print/gtklp/files/digest-gtklp-1.0d
deleted file mode 100644
index b2379b57b1aa..000000000000
--- a/net-print/gtklp/files/digest-gtklp-1.0d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eacea48c91360bb20133238ce1377359 gtklp-1.0d.src.tar.gz 1328798
diff --git a/net-print/gtklp/files/digest-gtklp-1.0f b/net-print/gtklp/files/digest-gtklp-1.0f
deleted file mode 100644
index b9f90bec265b..000000000000
--- a/net-print/gtklp/files/digest-gtklp-1.0f
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce01d390f94b00b899ffa0c69596602f gtklp-1.0f.src.tar.gz 1328732
diff --git a/net-print/gtklp/files/digest-gtklp-1.0g b/net-print/gtklp/files/digest-gtklp-1.0g
deleted file mode 100644
index f95b3ace88ec..000000000000
--- a/net-print/gtklp/files/digest-gtklp-1.0g
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e4a632ca975a36f8003f6c27a5f8b7e gtklp-1.0g.src.tar.gz 1604100
diff --git a/net-print/gtklp/files/digest-gtklp-1.1.0 b/net-print/gtklp/files/digest-gtklp-1.1.0
new file mode 100644
index 000000000000..d9baf679fc31
--- /dev/null
+++ b/net-print/gtklp/files/digest-gtklp-1.1.0
@@ -0,0 +1 @@
+MD5 67e3ed1e840ad8cdbbf34dbb8d2bd843 gtklp-1.1.0.src.tar.gz 1623476
diff --git a/net-print/gtklp/gtklp-1.0d.ebuild b/net-print/gtklp/gtklp-1.0d.ebuild
deleted file mode 100644
index ce36ff043911..000000000000
--- a/net-print/gtklp/gtklp-1.0d.ebuild
+++ /dev/null
@@ -1,48 +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-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
-}
diff --git a/net-print/gtklp/gtklp-1.0f.ebuild b/net-print/gtklp/gtklp-1.0f.ebuild
deleted file mode 100644
index c04580518b6d..000000000000
--- a/net-print/gtklp/gtklp-1.0f.ebuild
+++ /dev/null
@@ -1,48 +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-1.0f.ebuild,v 1.1 2005/07/10 15:52:24 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
-}
diff --git a/net-print/gtklp/gtklp-1.0g.ebuild b/net-print/gtklp/gtklp-1.1.0.ebuild
index 500151581a55..d178d9e92060 100644
--- a/net-print/gtklp/gtklp-1.0g.ebuild
+++ b/net-print/gtklp/gtklp-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.0g.ebuild,v 1.1 2005/08/02 21:46:24 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.1.0.ebuild,v 1.1 2006/02/04 21:56:42 vanquirius Exp $
 
 inherit libtool
 
@@ -11,10 +11,9 @@ HOMEPAGE="http://gtklp.sourceforge.net"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 LICENSE="GPL-2"
-IUSE="gtk2 nls ssl"
+IUSE="nls ssl"
 
-DEPEND="!gtk2? ( =x11-libs/gtk+-1.2* )
-	gtk2? ( >=x11-libs/gtk+-2 )
+DEPEND=">=x11-libs/gtk+-2
 	>=net-print/cups-1.1.12
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )"
@@ -22,18 +21,10 @@ DEPEND="!gtk2? ( =x11-libs/gtk+-1.2* )
 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"
@@ -41,8 +32,8 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO || die
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README NEWS TODO || die
 
-	use nls || rm -rf ${D}/usr/share/locale
+	use nls || rm -rf "${D}"/usr/share/locale
 }