net-print/cupsddk - fix automagic fltk dependency, add fltk use flag, require cups-1.2

svn path=/sunrise/; revision=2167

4 files changed, 56 insertions, 11 deletions

diff --git a/net-print/cupsddk/ChangeLog b/net-print/cupsddk/ChangeLog
index e75c98779..441de5323 100644
--- a/net-print/cupsddk/ChangeLog
+++ b/net-print/cupsddk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Dec 2006; Jakub Moc <jakub@gentoo.org> cupsddk-1.1.0_p20061207.ebuild,
+  +files/cupsddk-fltk-automagic.patch:
+  Fix automatick fltk dependency and add fltk use flag, require cups-1.2
+
   08 Dec 2006; Jakub Moc <jakub@gentoo.org> cupsddk-1.1.0_p20061207.ebuild:
   Add missing cups dependency, fix prestripped binaries, fix docs location,
   install HTML docs and others, hack to avoid a stupid collision with cups
diff --git a/net-print/cupsddk/Manifest b/net-print/cupsddk/Manifest
index 1ff6c74b5..768574f17 100644
--- a/net-print/cupsddk/Manifest
+++ b/net-print/cupsddk/Manifest
@@ -1,12 +1,16 @@
+AUX cupsddk-fltk-automagic.patch 913 RMD160 bbc0ce9809dafac2a0f82024d4b23294acf63717 SHA1 7e3a3d043097dc39e4a4937d7669844c61e17122 SHA256 568807c4df9f4c6b442976cb69b13b43029870c793a68076ae5b893efc4ca268
+MD5 c53b6602cc1d3eb6d954886815baad91 files/cupsddk-fltk-automagic.patch 913
+RMD160 bbc0ce9809dafac2a0f82024d4b23294acf63717 files/cupsddk-fltk-automagic.patch 913
+SHA256 568807c4df9f4c6b442976cb69b13b43029870c793a68076ae5b893efc4ca268 files/cupsddk-fltk-automagic.patch 913
 DIST cupsddk-1.1.0_p20061207.tar.bz2 5170083 RMD160 e0e423b69d51d9a72e8074e1f82ce08f35c47157 SHA1 9543975ea0e9a50c57ac7fd987a7293fe4cc1cb1 SHA256 a5271b9dfce396f5e9e29d28781c0c75c5c6a88ffd7fb3da7f9c63a9064c3aa4
-EBUILD cupsddk-1.1.0_p20061207.ebuild 1410 RMD160 ffe682904616660f3fbb2e11be318b2268e2e622 SHA1 fe04f9c6f3ef529855e4ac0049ef2f1908d267ec SHA256 c07c4323d2302cb1cbbcb7cad255264feaaff9699c913a132aadc1404f7a9601
-MD5 3b4fcfae70535f6b5a37cdb74f8eca28 cupsddk-1.1.0_p20061207.ebuild 1410
-RMD160 ffe682904616660f3fbb2e11be318b2268e2e622 cupsddk-1.1.0_p20061207.ebuild 1410
-SHA256 c07c4323d2302cb1cbbcb7cad255264feaaff9699c913a132aadc1404f7a9601 cupsddk-1.1.0_p20061207.ebuild 1410
-MISC ChangeLog 693 RMD160 6ff00a5798fdf593ce1d25b92b16676ec6960a1e SHA1 afeae3e2ae16bf2762813fa6ebde910a5b4a7d61 SHA256 742d8f0e90986eaa92f15918463d52abe19635a2e71f9730a27f97ff68408e0f
-MD5 89323386e722647bbc6e11786b4814b9 ChangeLog 693
-RMD160 6ff00a5798fdf593ce1d25b92b16676ec6960a1e ChangeLog 693
-SHA256 742d8f0e90986eaa92f15918463d52abe19635a2e71f9730a27f97ff68408e0f ChangeLog 693
+EBUILD cupsddk-1.1.0_p20061207.ebuild 1615 RMD160 49b640b2c8ef7307a847da4ffe7effc8cd60ac7d SHA1 5305ca4ba75004ddd50c373b2fc82a58ca0956ae SHA256 6c65ebe60fc90c3e2152014faaf85a2f67c160aa5a44fa105e47b5597ff31123
+MD5 5378ea2e62850026bb8f58d05c227307 cupsddk-1.1.0_p20061207.ebuild 1615
+RMD160 49b640b2c8ef7307a847da4ffe7effc8cd60ac7d cupsddk-1.1.0_p20061207.ebuild 1615
+SHA256 6c65ebe60fc90c3e2152014faaf85a2f67c160aa5a44fa105e47b5597ff31123 cupsddk-1.1.0_p20061207.ebuild 1615
+MISC ChangeLog 882 RMD160 1ad4168dc11f76c3998455f4f36a23eb1474ee7b SHA1 8a1e5d385520450d8140980fe78d683b32d6c07e SHA256 4e233d6773934839737bb7be82740aba625c4ea8336c4055f2df8d60424d03f2
+MD5 77651f653b5fdcfdd7283e65a6563b36 ChangeLog 882
+RMD160 1ad4168dc11f76c3998455f4f36a23eb1474ee7b ChangeLog 882
+SHA256 4e233d6773934839737bb7be82740aba625c4ea8336c4055f2df8d60424d03f2 ChangeLog 882
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/net-print/cupsddk/cupsddk-1.1.0_p20061207.ebuild b/net-print/cupsddk/cupsddk-1.1.0_p20061207.ebuild
index 953a3ddd4..b75cb47ba 100644
--- a/net-print/cupsddk/cupsddk-1.1.0_p20061207.ebuild
+++ b/net-print/cupsddk/cupsddk-1.1.0_p20061207.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+WANT_AUTOCONF="latest"
+
+inherit autotools eutils
+
 DESCRIPTION="A suite of standard drivers, a PPD file compiler, and other utilities to develop printer drivers for CUPS and other printing environments."
 HOMEPAGE="http://www.cups.org/ddk/index.php"
 SRC_URI="http://jdettner.free.fr/gentoo/cupsddk/${P}.tar.bz2"
@@ -9,24 +13,31 @@ SRC_URI="http://jdettner.free.fr/gentoo/cupsddk/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="fltk"
 
-RDEPEND="net-print/cups"
-DEPEND="${RDEPEND}"
+DEPEND=">=net-print/cups-1.2
+	fltk? ( =x11-libs/fltk-1.1* )"
+DEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	# fix prestripped binaries, nuke SVN dirs
 	sed -i -e "/INSTALL_BIN/s/-s//" Makedefs.in || die "sed failed"
 	find . -type d -name '.svn' -print0 | xargs -0 rm -rf
+
+	# fix automagic fltk dependency
+	epatch "${FILESDIR}"/${PN}-fltk-automagic.patch
+	eautoconf
 }
 
 src_compile() {
 	econf BUILDROOT="${D}" \
 		--with-docdir=/usr/share/doc/${PF} \
+		$(use_with fltk) \
 		|| die "econf failed"
 	emake BUILDROOT="${D}" || die "emake failed"
 }
diff --git a/net-print/cupsddk/files/cupsddk-fltk-automagic.patch b/net-print/cupsddk/files/cupsddk-fltk-automagic.patch
new file mode 100644
index 000000000..8fc287921
--- /dev/null
+++ b/net-print/cupsddk/files/cupsddk-fltk-automagic.patch
@@ -0,0 +1,26 @@
+--- configure.in.orig	2006-12-07 14:19:48.000000000 +0100
++++ configure.in	2006-12-08 05:00:27.000000000 +0100
+@@ -164,14 +164,16 @@
+ AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR(CUPS headers are not installed!))
+ 
+ dnl Check for FLTK...
+-AC_PATH_PROG(FLTKCONFIG,fltk-config)
++AC_ARG_WITH([fltk], AS_HELP_STRING([--with-fltk], [Build with fltk library GUI (default: disabled)]))
+ 
+-if test "x$FLTKCONFIG" = x; then
+-#	AC_MSG_ERROR([Sorry, the CUPS DDK requires FLTK 1.1.x.])
+-	GUILIBS=""
+-else
+-	CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS"
+-	GUILIBS="`$FLTKCONFIG --use-images --ldstaticflags`"
++if test "x$with_fltk" == "xyes"; then
++	if test "x$FLTKCONFIG" = x; then
++		AC_MSG_ERROR([Sorry, the CUPS DDK GUI requires FLTK 1.1.x.])
++	else
++		AC_PATH_PROG(FLTKCONFIG,fltk-config)
++		CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS"
++		GUILIBS="`$FLTKCONFIG --use-images --ldstaticflags`"
++	fi
+ fi
+ 
+ AC_SUBST(FLTKCONFIG)