ebuild cleanup wrt #208584

(Portage version: 2.1.4.4)

3 files changed, 64 insertions, 40 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/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
 }