gtklp-1.0c.ebuild.diff

gtklp-1.0c.diff (text/plain), 1.72 KB, created by Ron Gemeinhardt on 2005-04-28 19:36:12 UTC

--- /usr/portage/net-print/gtklp/gtklp-0.9p.ebuild	2005-01-05 11:16:25.000000000 -0500
+++ /usr/local/portage/net-print/gtklp/gtklp-1.0c.ebuild	2005-04-28 21:53:31.000000000 -0400
@@ -1,6 +1,6 @@
 # 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.9p.ebuild,v 1.8 2005/01/05 16:12:45 sekretarz Exp $
+# $Header: $
 
 inherit libtool
 
@@ -9,11 +9,12 @@
 HOMEPAGE="http://gtklp.sourceforge.net"
 
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 LICENSE="GPL-2"
-IUSE="nls ssl"
+IUSE="gtk2 nls ssl"
 
-DEPEND="=x11-libs/gtk+-1.2*
+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 )"
@@ -26,21 +27,22 @@
 	# 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"
+	# 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
+	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS || die
 
 	use nls || rm -rf ${D}/usr/share/locale
 }