net-print/cupsddk - Add missing cups dependency, fix prestripped binaries, fix docs location, install HTML docs and others, hack to avoid a stupid collision with cups directory.

svn path=/sunrise/; revision=2166

3 files changed, 43 insertions, 12 deletions

diff --git a/net-print/cupsddk/ChangeLog b/net-print/cupsddk/ChangeLog
index 7b81f2fab..e75c98779 100644
--- a/net-print/cupsddk/ChangeLog
+++ b/net-print/cupsddk/ChangeLog
@@ -2,6 +2,11 @@
 # 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:
+  Add missing cups dependency, fix prestripped binaries, fix docs location,
+  install HTML docs and others, hack to avoid a stupid collision with cups
+  directory.
+
   07 Dec 2006; Markus Ullmann <jokey@gentoo.org>
   cupsddk-1.1.0_p20061207.ebuild:
   Whitespaces
diff --git a/net-print/cupsddk/Manifest b/net-print/cupsddk/Manifest
index ef32a1837..1ff6c74b5 100644
--- a/net-print/cupsddk/Manifest
+++ b/net-print/cupsddk/Manifest
@@ -1,12 +1,12 @@
 DIST cupsddk-1.1.0_p20061207.tar.bz2 5170083 RMD160 e0e423b69d51d9a72e8074e1f82ce08f35c47157 SHA1 9543975ea0e9a50c57ac7fd987a7293fe4cc1cb1 SHA256 a5271b9dfce396f5e9e29d28781c0c75c5c6a88ffd7fb3da7f9c63a9064c3aa4
-EBUILD cupsddk-1.1.0_p20061207.ebuild 687 RMD160 7af5184a42a59c736830dff2c5a89c56266b1434 SHA1 d1f95d57f94af8b1a078cd95890896834044647b SHA256 bcdc82de0e582e8f29d46328004a1120090422e4377465d77ebbb54fc637c02d
-MD5 5875915fbd116c9f1de91ae12daac5fa cupsddk-1.1.0_p20061207.ebuild 687
-RMD160 7af5184a42a59c736830dff2c5a89c56266b1434 cupsddk-1.1.0_p20061207.ebuild 687
-SHA256 bcdc82de0e582e8f29d46328004a1120090422e4377465d77ebbb54fc637c02d cupsddk-1.1.0_p20061207.ebuild 687
-MISC ChangeLog 452 RMD160 1ad9be3cd646eed03ab6078e41a2290567ac1b0d SHA1 ec380d30ea4f77b01ae6eb5e81c5c3c3578e5333 SHA256 2a6bbb1dad7ddf59a71d92678f7dcc98888ccd0dc1e888704dbac013686bf7e0
-MD5 b4ec0ec53a65aa2cde689644ad63bae4 ChangeLog 452
-RMD160 1ad9be3cd646eed03ab6078e41a2290567ac1b0d ChangeLog 452
-SHA256 2a6bbb1dad7ddf59a71d92678f7dcc98888ccd0dc1e888704dbac013686bf7e0 ChangeLog 452
+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
 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 2c3c6a741..953a3ddd4 100644
--- a/net-print/cupsddk/cupsddk-1.1.0_p20061207.ebuild
+++ b/net-print/cupsddk/cupsddk-1.1.0_p20061207.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-DESCRIPTION="Provides a suite of standard drivers, a PPD file compiler, and other utilities that can be used to develop printer drivers for CUPS and other printing environments."
+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"
 
@@ -11,16 +11,42 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+RDEPEND="net-print/cups"
+DEPEND="${RDEPEND}"
 
 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
+}
+
 src_compile() {
-	econf BUILDROOT="${D}" || die "econf failed"
+	econf BUILDROOT="${D}" \
+		--with-docdir=/usr/share/doc/${PF} \
+		|| die "econf failed"
 	emake BUILDROOT="${D}" || die "emake failed"
 }
 
 src_install() {
 	emake BUILDROOT="${D}" install || die "emake install failed"
+	keepdir /usr/share/cups/drv
+
+	# FIXME!!! This thing would collide with a directory installed by cups
+	# no idea why is it installed there
+	mv ${D}/usr/libexec/cups/driver ${D}/usr/bin/cupsddk-driver
+	
+	rm -f LICENSE.* doc/Makefile
+	dodoc *.txt
+	dohtml -r doc/*
+}
+
+pkg_postinst() {
+	elog "*** FIXME!!! ***"
+	elog "The included driver binary has been installed as /usr/bin/cupsddk-driver"
+	elog "to prevent collision with a directory installed by cups"
+	elog "*** FIXME!!! ***"
 }