quoting, revamp src_install a bit, fix pkg_postinst, cosmetics...

svn path=/sunrise/; revision=599

diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 96142b460810cdba9b23f25a55d4b36b04822836..09328ade863f8985a1203bfffda77bbd78d01cfb 100644 (file)
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -15,14 +15,14 @@ MD5 2a31dac70369bbcb2b089e712eb1138e files/psybnc.initd 564
 RMD160 8d35e3b9eb8ccf8373f5b1af42e7dbb7097462b7 files/psybnc.initd 564
 SHA256 83ebe88abf3167fee1756b23e752fb46be9dc30e2d2c020a233b881698aea3ae files/psybnc.initd 564
 DIST psyBNC-2.3.2-7.tar.gz 312177 RMD160 6a7311a3219fa005219a815bbbac188c315bd2b2 SHA1 d3d06e05c447f7366761a85af204222eddb55e2d SHA256 be38468b374b0470a5728b154527019b7d613c90dc23a93053fda7cdd93f6519
 RMD160 8d35e3b9eb8ccf8373f5b1af42e7dbb7097462b7 files/psybnc.initd 564
 SHA256 83ebe88abf3167fee1756b23e752fb46be9dc30e2d2c020a233b881698aea3ae files/psybnc.initd 564
 DIST psyBNC-2.3.2-7.tar.gz 312177 RMD160 6a7311a3219fa005219a815bbbac188c315bd2b2 SHA1 d3d06e05c447f7366761a85af204222eddb55e2d SHA256 be38468b374b0470a5728b154527019b7d613c90dc23a93053fda7cdd93f6519

-EBUILD psybnc-2.3.2.7.ebuild 2212 RMD160 3bc10698196250ea8c1f8e90b90bee2ae64a89e8 SHA1 775592a7da9e0227ef0d476062755dcd88124a0f SHA256 9ad9d993c6aed00404b2cdabdb8fc16be5ab076dae18001e0d00f1991df74b32
-MD5 1c9f48dee862b36cb2d1a5f87702e9f3 psybnc-2.3.2.7.ebuild 2212
-RMD160 3bc10698196250ea8c1f8e90b90bee2ae64a89e8 psybnc-2.3.2.7.ebuild 2212
-SHA256 9ad9d993c6aed00404b2cdabdb8fc16be5ab076dae18001e0d00f1991df74b32 psybnc-2.3.2.7.ebuild 2212
-MISC ChangeLog 287 RMD160 f10656abf3ed259c20ca97bbab198f69d02dabb3 SHA1 2ea65ff7e417d1a165f9ba9dda12fe2ed0d83331 SHA256 a0b89288afd7c14dcdbcb70c8b68457c41898ccdcb12878277e12ed0ffd9f232
-MD5 33456adcaa13151262ffa7514dc598c1 ChangeLog 287
-RMD160 f10656abf3ed259c20ca97bbab198f69d02dabb3 ChangeLog 287
-SHA256 a0b89288afd7c14dcdbcb70c8b68457c41898ccdcb12878277e12ed0ffd9f232 ChangeLog 287
+EBUILD psybnc-2.3.2.7.ebuild 1937 RMD160 e7c6c08ce43407060bdb1f3a96338815352dd813 SHA1 69c82706757a218c7ff8cd0e58c1998bf25b5e17 SHA256 d2f9eff77b4443f1a12912596bad9841ee3d48006c0539886335e9427f2e45d8
+MD5 dc04abe694771b6c9e560402c93a83ff psybnc-2.3.2.7.ebuild 1937
+RMD160 e7c6c08ce43407060bdb1f3a96338815352dd813 psybnc-2.3.2.7.ebuild 1937
+SHA256 d2f9eff77b4443f1a12912596bad9841ee3d48006c0539886335e9427f2e45d8 psybnc-2.3.2.7.ebuild 1937
+MISC ChangeLog 286 RMD160 9d200a584aabd3c910984380b69308c237cfcfbe SHA1 49c8125e06c2cfb09952d0d39985d74d12fad3c3 SHA256 a4fb3f2c27ed4eafb9090e2ed7d8592ff236e12b73de52f0601375bdc1b3d35b
+MD5 8acda4171477af617dc743c2b5bdc44f ChangeLog 286
+RMD160 9d200a584aabd3c910984380b69308c237cfcfbe ChangeLog 286
+SHA256 a4fb3f2c27ed4eafb9090e2ed7d8592ff236e12b73de52f0601375bdc1b3d35b ChangeLog 286

 MISC metadata.xml 367 RMD160 d27fab183bd5537ddb6d546cf1e8e22d30dfe166 SHA1 1141940781391bccb9645a9534ca238b8f5ecbd2 SHA256 8addc1375cc69faafe6892005d9e1e73bd3b670ab4e5610484146fbd8287761f
 MD5 7b6337aba643cf53002436abd1d5495e metadata.xml 367
 RMD160 d27fab183bd5537ddb6d546cf1e8e22d30dfe166 metadata.xml 367
 MISC metadata.xml 367 RMD160 d27fab183bd5537ddb6d546cf1e8e22d30dfe166 SHA1 1141940781391bccb9645a9534ca238b8f5ecbd2 SHA256 8addc1375cc69faafe6892005d9e1e73bd3b670ab4e5610484146fbd8287761f
 MD5 7b6337aba643cf53002436abd1d5495e metadata.xml 367
 RMD160 d27fab183bd5537ddb6d546cf1e8e22d30dfe166 metadata.xml 367

diff --git a/net-irc/psybnc/psybnc-2.3.2.7.ebuild b/net-irc/psybnc/psybnc-2.3.2.7.ebuild
index ec03a53010eefbe1bc66904eb2f88afe4661c511..1c9c1045a4cc37b67604a3a8eb505694c309fdb7 100644 (file)
--- a/net-irc/psybnc/psybnc-2.3.2.7.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.7.ebuild
@@ -24,8 +24,8 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
 
 src_unpack() {
        unpack ${A}

-       cd ${S}
-       epatch ${FILESDIR}/${PF}-gentoo.diff
+       cd "${S}"
+       epatch "${FILESDIR}/${PF}-gentoo.diff"

 }
 
 src_compile() {
 }
 
 src_compile() {


@@ -33,32 +33,24 @@ src_compile() {
 }
 
 src_install() {
 }
 
 src_install() {

-       dodoc CHANGES COPYING FAQ README SCRIPTING TODO
-       dodir ${INSTALLDIR}/help ${INSTALLDIR}/key ${INSTALLDIR}/lang ${INSTALLDIR}/log ${INSTALLDIR}/motd ${INSTALLDIR}/scripts
+       dodoc CHANGES FAQ README SCRIPTING TODO
+
+       for dir in help key lang log motd scripts ; do
+               dodir ${INSTALLDIR}/${dir}
+               insinto ${INSTALLDIR}/${dir}
+               doins ${dir}/*
+       done

 
 

-       insinto ${INSTALLDIR}/help
-       doins help/*
-       insinto ${INSTALLDIR}/key
-       doins key/*
-       insinto ${INSTALLDIR}/lang
-       doins lang/*
-       insinto ${INSTALLDIR}/log
-       doins log/*
-       insinto ${INSTALLDIR}/motd
-       doins motd/*
-       insinto ${INSTALLDIR}/scripts
-       doins scripts/*

        insinto ${INSTALLDIR}
        insinto ${INSTALLDIR}

-       doins ${FILESDIR}/psybnc.conf config.h
+       doins "${FILESDIR}"/psybnc.conf config.h

 
        exeinto ${INSTALLDIR}
        doexe psybnc
 
        exeinto ${INSTALLDIR}
        doexe psybnc

-       exeinto /etc/init.d
-       newexe ${FILESDIR}/psybnc.initd psybnc
-       insinto /etc/conf.d
-       newins ${FILESDIR}/psybnc.confd psybnc

 
 

-       chown -R psybnc:psybnc ${D}/${INSTALLDIR}
+       newinitd "${FILESDIR}"/psybnc.initd psybnc
+       newconfd "${FILESDIR}"/psybnc.confd psybnc
+
+       chown -R psybnc:psybnc "${D}"/${INSTALLDIR}

 }
 
 pkg_config() {
 }
 
 pkg_config() {


@@ -72,7 +64,7 @@ pkg_config() {
 
 pkg_postinst() {
        einfo ""
 
 pkg_postinst() {
        einfo ""

-       einfo "Please run \"emerge --config =psybnc-${MY_PV}\" to create SSL certificates for your system."
+       einfo "Please run \"emerge --config =${CATEGORY}/${PF}\" to create SSL certificates for your system."

        einfo "You can connect to the bnc on port 23998, user=gentoo, pass=gentoo,"
        einfo "please edit the psybnc configuration in ${INSTALLDIR}/psybnc.conf to change this."
        einfo ""
        einfo "You can connect to the bnc on port 23998, user=gentoo, pass=gentoo,"
        einfo "please edit the psybnc configuration in ${INSTALLDIR}/psybnc.conf to change this."
        einfo ""