fix #212396; ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

diff --git a/net-irc/cgiirc/ChangeLog b/net-irc/cgiirc/ChangeLog
index 71ffea84a8ed603eee51457d3db5c1b5be101f3e..3f134793e77d1890267fe8a7a746b8450c9f030a 100644 (file)
--- a/net-irc/cgiirc/ChangeLog
+++ b/net-irc/cgiirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/cgiirc
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/ChangeLog,v 1.11 2006/10/04 04:07:30 rl03 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/ChangeLog,v 1.12 2008/03/07 10:30:35 hollow Exp $
+
+  07 Mar 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  cgiirc-0.5.9.ebuild:
+  fix #212396; ebuild cleanup wrt #208584
 
 *cgiirc-0.5.9 (04 Oct 2006)
 

diff --git a/net-irc/cgiirc/Manifest b/net-irc/cgiirc/Manifest
index 26b6fea8457e10b50f5e9631f174e6c81b3eee8a..60f0828bb029423797eb0178b804933c70aad68e 100644 (file)
--- a/net-irc/cgiirc/Manifest
+++ b/net-irc/cgiirc/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST cgiirc-0.5.9.tar.gz 135163 RMD160 302169c4c2558f5d2368bdcfeed45a224cac8ebc SHA1 c3064022401ccb0540b363456cea00b73ccf26e2 SHA256 41b26ed5c75c57663281234f7ead33c23aa92b798807df62e4ff980d19fef330
-EBUILD cgiirc-0.5.9.ebuild 960 RMD160 cd537c06bfe194b7ef173194ec5c315b4bf64f05 SHA1 3e69173681b62b96857699dc7a975f781a1bbd24 SHA256 cc3742de0bba25ac5d145299693ebf12e1cf71fdb3cab7b2a63a678ba4095567
-MISC ChangeLog 1511 RMD160 81f7794923f58b20e150293363e2220f5e2ec5d1 SHA1 42ba12a1f720a2adcdb4ddcde656e33c037a68d6 SHA256 ec8822ad919edb028a0bf71f94c4fa7e8adba446ba2e05c39daa18c0fcc8b33e
-MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
+EBUILD cgiirc-0.5.9.ebuild 977 RMD160 d2dbfba0e960f24895d7f3804c4c1c2d89eccf90 SHA1 b08a1233de55b789d83cec5c3e249307400b805f SHA256 9ca3f9c2e683e4010ef7cea7a4fd57e396549ca5e168e45af062c896b2493f4f
+MISC ChangeLog 1643 RMD160 ebd84ea44cb3937d037a72f9a73f2a69cb68ef9e SHA1 d69b64fdb16b7a2a5840bb7f6463774a33f481d8 SHA256 237da7dec30ae5eed10996ad6be4364997a84e21c773d0bbe34b9d1c74816e5d
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfRGVcACgkQmPFBzbX68WERKwCeJEGtYYopI1Chp9Vpw/ykex+A
+B4wAmgJyNGYOMl4aVNYgRhnHNeZeqqpk
+=5CZN
+-----END PGP SIGNATURE-----

diff --git a/net-irc/cgiirc/cgiirc-0.5.9.ebuild b/net-irc/cgiirc/cgiirc-0.5.9.ebuild
index 8d4b2d8035bc54ad56c556e237f813bcc6ae0d3b..0ff41c8f5f433ea811c2b4e9120984e4c073ea77 100644 (file)
--- a/net-irc/cgiirc/cgiirc-0.5.9.ebuild
+++ b/net-irc/cgiirc/cgiirc-0.5.9.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.9.ebuild,v 1.1 2006/10/04 04:07:30 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.9.ebuild,v 1.2 2008/03/07 10:30:35 hollow Exp $
 
-IUSE=""
-
-inherit webapp
+inherit webapp eutils
 
 DESCRIPTION="A perl/CGI program to use IRC from a web browser"
 HOMEPAGE="http://cgiirc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
 
-src_unpack() {
+pkg_setup() {
+       webapp_pkg_setup
        elog "Note that file locations have changed."
        elog "CGI:IRC will be installed into cgi-bin/${P}"
+}
+
+src_unpack() {
        unpack ${A}
-       find ${S} -name .cvsignore -exec rm {} \;
+       cd "${S}"
+       ecvs_clean
 }
 
 src_install() {
@@ -26,15 +31,12 @@ src_install() {
 
        dodoc docs/{CHANGES,TODO} ${docs}
        dohtml docs/help.html
+       rm -rf docs/ ${docs}
 
-       dodir ${MY_CGIBINDIR}/${P}
-
-       cp -R . ${D}/${MY_CGIBINDIR}/${P}
-
-       cd ${D}/${MY_CGIBINDIR}/${P}
-       rm -rf docs ${docs}
-
-       webapp_configfile ${MY_CGIBINDIR}/${P}/cgiirc.config
+       insinto "${MY_CGIBINDIR}"/${P}
+       doins -r .
+       fperms +x "${MY_CGIBINDIR}"/${P}/irc.cgi
 
+       webapp_configfile "${MY_CGIBINDIR}"/${P}/cgiirc.config
        webapp_src_install
 }

diff --git a/net-irc/cgiirc/metadata.xml b/net-irc/cgiirc/metadata.xml
index 13bc126c7d91b705f6d4c5303e1e9c4578749147..6632069b5affe97b4a3e8c8a10c3fef22951c014 100644 (file)
--- a/net-irc/cgiirc/metadata.xml
+++ b/net-irc/cgiirc/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
+       <herd>web-apps</herd>
 </pkgmetadata>