ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

4 files changed, 77 insertions, 43 deletions

diff --git a/www-apps/drraw/ChangeLog b/www-apps/drraw/ChangeLog
index 658ad909042d..21034583dcdd 100644
--- a/www-apps/drraw/ChangeLog
+++ b/www-apps/drraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/drraw
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/ChangeLog,v 1.8 2007/02/22 00:29:45 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/ChangeLog,v 1.9 2008/02/22 17:06:43 hollow Exp $
+
+  22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> drraw-2.0.1.ebuild,
+  drraw-2.1.3.ebuild:
+  ebuild cleanup wrt #208584
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/www-apps/drraw/Manifest b/www-apps/drraw/Manifest
index ab192cf65ef2..13316fa879c0 100644
--- a/www-apps/drraw/Manifest
+++ b/www-apps/drraw/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 137 RMD160 f8cf7573ad192a87141110046b63980bcbfb872d SHA1 1aee0d7ba51bc0c00d45e7e4d711e04ddc96fe92 SHA256 433a5ba1d31484646faea29ad158ae674c487cff8d867d7818fcc97ca0430041
 DIST drraw-2.0.1.tgz 40970 RMD160 fe467042632d0bf075d48b5778bcf0a45811eaf7 SHA1 0f4f31e01170b83c40b9e0acca61212b1be055e9 SHA256 4fb52e116635951a5767be08b589c34633095394f94c7df5cbc2b8b88cc41c69
 DIST drraw-2.1.3.tgz 45970 RMD160 238d637c6c0ad19b4a8f611db99b0fd3d98bfeb0 SHA1 e106ccdc416124e4697936e4aeb54935e7a48aa9 SHA256 c3290781426f81327632b4b0da80360882438f3d44cca81fdeaa3f9b22c3674e
-EBUILD drraw-2.0.1.ebuild 1075 RMD160 4d0ae25f362cbfc2bf9ef60b155b9332c9c815f4 SHA1 c1582f8a88867bd05f58524b1f5bd5fca3488527 SHA256 3ecfd95c9aef7c5bc4822ab9470b31183f6b9caac3b3d14e4802282afc9811d6
-EBUILD drraw-2.1.3.ebuild 1099 RMD160 faae5fad95256fc216aa2f18536b6f447d4e9746 SHA1 27b8cccb4f74dfd59759386e0fb8f7350812e8bc SHA256 518216c1dfaf0f1adc5aa4ba0c71b56317be7e0aa881dc445c9276e330f312df
-MISC ChangeLog 1119 RMD160 426d634004f2db6f13cd922f85c0cfefd2507ef9 SHA1 5c7206b3cf68856b5f0e98697fb8d1394d8396cc SHA256 c2c27429e54235894ecdeb73140e6a147e2cdd6a483fdb237691a5495b329943
+EBUILD drraw-2.0.1.ebuild 1139 RMD160 0021968ba335cb62140f26beac14d4c977e2188a SHA1 80698bee3fafb17c2dd51e912eb853ff2c137546 SHA256 b49e94eb6e1b1b57dcd5298a022ee4ff122bf8ee22fe39085b083e45177a957a
+EBUILD drraw-2.1.3.ebuild 1146 RMD160 47e449e749d0ed3acfbc41ab465e044befdb90ba SHA1 83865aab664c6a1d8a0148aa203c3c5c70b9fc04 SHA256 51fe8ad7353cb4b130695061796a7a0aa260c4334a9cfd5d6d792c8cb66ce6bf
+MISC ChangeLog 1242 RMD160 709573b72ba1136e99cbcf00485c7c46ddac78a0 SHA1 22ef0bf19df56f3f35b9c40cae0fd2ec86e56589 SHA256 b59e30efed2a6ceb018556a23e16eba5dd9585eb6b09a62a98db832c56046a91
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke/ASwACgkQmPFBzbX68WGTSgCfZum6D0lm1JDfPmVBuU8CtKUj
+3jUAniEY2z0+y0dEGOhQ2ZGPHBOkXnn2
+=xObI
+-----END PGP SIGNATURE-----
diff --git a/www-apps/drraw/drraw-2.0.1.ebuild b/www-apps/drraw/drraw-2.0.1.ebuild
index 693480aa33ba..d23245d31707 100644
--- a/www-apps/drraw/drraw-2.0.1.ebuild
+++ b/www-apps/drraw/drraw-2.0.1.ebuild
@@ -1,38 +1,50 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.0.1.ebuild,v 1.4 2004/09/03 17:17:20 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.0.1.ebuild,v 1.5 2008/02/22 17:06:43 hollow Exp $
 
 inherit webapp
 
-IUSE=""
-
-DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool that allows you to interactively build graphs of your own design"
+DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool"
 HOMEPAGE="http://web.taranis.org/drraw"
 SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
 
+LICENSE="GPL-2"
 KEYWORDS="~x86 ppc"
+IUSE=""
 
-RDEPEND="
-	>=dev-lang/perl-5.6
-	>=net-analyzer/rrdtool-1.0.47
-"
+RDEPEND=">=dev-lang/perl-5.6
+	virtual/perl-CGI
+	>=net-analyzer/rrdtool-1.0.47"
 
-LICENSE="GPL-2"
+need_httpd_cgi
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -e "s|/usr/local/bin/perl|/usr/bin/perl|
-		s|/drraw.conf|/../drraw.conf|" -i drraw.cgi
-	sed -e "s|/somewhere/drraw/saved|/tmp|
-		s|/somewhere/drraw/tmp|/tmp|" -i drraw.conf
+	cd "${S}"
+	sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|" drraw.cgi
+	sed -i \
+		-e "s|/somewhere/drraw/saved|/tmp|" \
+		-e "s|/somewhere/drraw/tmp|/tmp|" \
+		drraw.conf
 }
 
 src_install() {
 	webapp_src_preinst
+
 	dodoc CHANGES INSTALL README.EVENTS WISHLIST
-	cp drraw.cgi ${D}/${MY_CGIBINDIR} && chmod +x ${D}/${MY_CGIBINDIR}/drraw.cgi
-	cp drraw.conf ${D}/${MY_HOSTROOTDIR}
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	rm CHANGES INSTALL README.EVENTS WISHLIST
+
+	insinto "${MY_CGIBINDIR}"
+	doins drraw.conf
+
+	exeinto "${MY_CGIBINDIR}"
+	doexe drraw.cgi
+
+	insinto "${MY_ICONSDIR}"
+	doins icons/*.gif
+
+	webapp_configfile "${MY_CGIBINDIR}"/drraw.conf
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
 }
diff --git a/www-apps/drraw/drraw-2.1.3.ebuild b/www-apps/drraw/drraw-2.1.3.ebuild
index 6a6db8e4310a..f0a682a248f1 100644
--- a/www-apps/drraw/drraw-2.1.3.ebuild
+++ b/www-apps/drraw/drraw-2.1.3.ebuild
@@ -1,42 +1,50 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.1.3.ebuild,v 1.3 2007/01/03 00:40:55 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drraw/drraw-2.1.3.ebuild,v 1.4 2008/02/22 17:06:43 hollow Exp $
 
 inherit webapp
 
-IUSE=""
-
-DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool that allows you to interactively build graphs of your own design"
+DESCRIPTION="drraw is a simple web based presentation front-end for RRDtool"
 HOMEPAGE="http://web.taranis.org/drraw"
 SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
 
-KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
 
-RDEPEND="
-	>=dev-lang/perl-5.6
+RDEPEND=">=dev-lang/perl-5.6
 	virtual/perl-CGI
-	>=net-analyzer/rrdtool-1.2.1
-"
+	>=net-analyzer/rrdtool-1.2.1"
 
-LICENSE="GPL-2"
+need_httpd_cgi
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -e "s|/usr/local/bin/perl|/usr/bin/perl|" -i drraw.cgi
-	sed -e "s|/somewhere/drraw/saved|/tmp|
-		s|/somewhere/drraw/tmp|/tmp|" -i drraw.conf
+	cd "${S}"
+	sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|" drraw.cgi
+	sed -i \
+		-e "s|/somewhere/drraw/saved|/tmp|" \
+		-e "s|/somewhere/drraw/tmp|/tmp|" \
+		drraw.conf
 }
 
 src_install() {
 	webapp_src_preinst
+
 	dodoc CHANGES INSTALL README.EVENTS WISHLIST
-	cp drraw.{cgi,conf} ${D}/${MY_CGIBINDIR}
-	cp icons/* ${MY_ICONSDIR}
+	rm CHANGES INSTALL README.EVENTS WISHLIST
+
+	insinto "${MY_CGIBINDIR}"
+	doins drraw.conf
+
+	exeinto "${MY_CGIBINDIR}"
+	doexe drraw.cgi
+
+	insinto "${MY_ICONSDIR}"
+	doins icons/*.gif
 
-	webapp_configfile ${MY_CGIBINDIR}/drraw.conf
+	webapp_configfile "${MY_CGIBINDIR}"/drraw.conf
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
-	chmod +x ${D}/${MY_CGIBINDIR}/drraw.cgi
 }