changelog:p

5 files changed, 49 insertions, 38 deletions

diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest
index 7c799bef5d47..03e20b90f250 100644
--- a/net-print/gtklp/Manifest
+++ b/net-print/gtklp/Manifest
@@ -1,8 +1,6 @@
-MD5 7d1788559326d20ea6797030d3576567 ChangeLog 1700
-MD5 4d873f88e43e9668b7b259c80ea49dd5 gtklp-0.9p.ebuild 1001
-MD5 6c377946c579d01395f3e1affb3838e1 gtklp-0.9k.ebuild 877
+MD5 e2ca824b045cf5a7640488c3b117b5d4 ChangeLog 1785
+MD5 67ddacedda65c1a3b47c5eb742d696ca gtklp-0.9p.ebuild 1150
 MD5 d64f50068ef3c2a739767d3f1a24d65d gtklp-0.9m.ebuild 1069
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 3021ef15adb0dbab1dc9262e26c71139 files/digest-gtklp-0.9p 66
-MD5 bbcdc70a06058c261973ea6c9183d7b7 files/digest-gtklp-0.9k 66
 MD5 88941bf6a2a64929bed95e7eded66a72 files/digest-gtklp-0.9m 127
diff --git a/net-print/gtklp/files/digest-gtklp-0.9k b/net-print/gtklp/files/digest-gtklp-0.9k
deleted file mode 100644
index 2bc3d9715ad1..000000000000
--- a/net-print/gtklp/files/digest-gtklp-0.9k
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2586ed9576228369dfc99d968fe2b39 gtklp-0.9k.src.tar.gz 499474
diff --git a/net-print/gtklp/files/digest-gtklp-0.9p b/net-print/gtklp/files/digest-gtklp-0.9p
new file mode 100644
index 000000000000..b69e29a4a77f
--- /dev/null
+++ b/net-print/gtklp/files/digest-gtklp-0.9p
@@ -0,0 +1 @@
+MD5 6e287468e9e01bae464c78a197f94160 gtklp-0.9p.src.tar.gz 533124
diff --git a/net-print/gtklp/gtklp-0.9k.ebuild b/net-print/gtklp/gtklp-0.9k.ebuild
deleted file mode 100644
index 74936bb24c95..000000000000
--- a/net-print/gtklp/gtklp-0.9k.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-0.9k.ebuild,v 1.6 2003/02/13 15:25:15 vapier Exp $
-
-S=${WORKDIR}/${P}
-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"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=net-print/cups-1.1.7"
-
-src_compile() {
-	local myconf=""
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-	use ssl \
-		&& myconf="${myconf} --enable-ssl" \
-		|| myconf="${myconf} --disable-ssl"
-
-	econf ${myconf}
-	emake || make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-}
diff --git a/net-print/gtklp/gtklp-0.9p.ebuild b/net-print/gtklp/gtklp-0.9p.ebuild
new file mode 100644
index 000000000000..cfdfdc450aca
--- /dev/null
+++ b/net-print/gtklp/gtklp-0.9p.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-0.9p.ebuild,v 1.1 2003/10/04 20:11:16 lanius Exp $
+
+inherit libtool
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A GUI for cupsd"
+SRC_URI="mirror://sourceforge/gtklp/${P}.src.tar.gz"
+HOMEPAGE="http://gtklp.sourceforge.net"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+
+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
+
+	# 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
+
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	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
+}