diff --git a/net-irc/atheme/ChangeLog b/net-irc/atheme/ChangeLog --- a/net-irc/atheme/ChangeLog +++ b/net-irc/atheme/ChangeLog @@ -3,6 +3,12 @@ # $Header: $ 16 Feb 2010; Nathan Phillip Brink (ohnobinki) + atheme-5.0.1.ebuild, +files/atheme.initd: + Support installing some stuff form contrib, such as a perl module and a + few database conversion C programs/modules. Added initscript. QA against + bundled libmowgli. Fixed /var paths. + + 16 Feb 2010; Nathan Phillip Brink (ohnobinki) +atheme-5.0.1.ebuild, +files/atheme-5.0.1-depend-parallel.patch, +files/atheme-5.0.1-ldap-as-needed.patch, diff --git a/net-irc/atheme/Manifest b/net-irc/atheme/Manifest --- a/net-irc/atheme/Manifest +++ b/net-irc/atheme/Manifest @@ -1,7 +1,8 @@ AUX atheme-5.0.1-depend-parallel.patch 457 RMD160 32c03cad4e1b3432b97370961f5d402006f6f404 SHA1 bbff9d88d95496aa750578012a25ba392627a889 SHA256 abbb351d50baf483bd37e2c2ad5eaa2dcf7a483cb5bda4f25910af8b9dd11305 AUX atheme-5.0.1-ldap-as-needed.patch 493 RMD160 3894b824bb6848695b63eae569fa2c6826c60a2e SHA1 ad15750f9c0a952fef7d595dd035e351800a3517 SHA256 da31b6a830860914d160bc0436a20a37f1fbce2c73ed2b8234ab46791e6e376f AUX atheme-5.0.1-with-ldap.patch 758 RMD160 28831504041ba3ec47cede827027e609f0f51d84 SHA1 1abd522ddc6cdb735347afc9013f6c9b8446cc7f SHA256 f65bccd4df149f6e1205a803dc0da29805bc864cb988a75c4ffaee4267db5901 +AUX atheme.initd 475 RMD160 c30e6093c4a95d3524e2ee3dacdad8638d58d253 SHA1 3f8ab87b47796a77f658641200018a36f210c091 SHA256 19cdf77845f765c2fef2e152de2f688f3eea2e675d92345d45bcd28462641df4 DIST atheme-services-5.0.1.tar.bz2 694093 RMD160 c97f6a36f628f7d31d88aeb8247645aab2f8c469 SHA1 e351af2a53bd08ed38c25dd601cae026ed4ace29 SHA256 db749339a88fb80397163ddbad219dca857b5a28e7a9bde6e456b769be0491b7 -EBUILD atheme-5.0.1.ebuild 1723 RMD160 214eefa2ae734f6187889b172987c19e1ff87e0e SHA1 73a8560ab62c02f6b30320841c60994e86ae9507 SHA256 8b50456da208d88930e366b2606795bf2b6435ff2edb82dcf6f20f01bb4c59d8 -MISC ChangeLog 462 RMD160 1e0604caefa79c122fa34fb6f34e7b984d946eb0 SHA1 84df47c4bf0ac4f219a078d45366aa4b4cc09bb2 SHA256 5991d55d714bc3c03711b8fb0ccdfda2a2515fe4c42e6dbbd642b78f929b4961 +EBUILD atheme-5.0.1.ebuild 2500 RMD160 192536e72d77cb6b90a37c99514c24e27a3e7a4d SHA1 3763c7f0aae9d7cae4a31611d7857315e5e8d747 SHA256 edfeb5bd1c50a8092f72d0690960a7c789a775957a6380ce9ae5105d0ecc731a +MISC ChangeLog 774 RMD160 42ec74582ef255712c8259543210e02ef39b8357 SHA1 ca6b577c68d032f0f89bc6f0fa3bd0af20a75137 SHA256 75218c039ff125853971600b5fda70f70e45ce6d229fb963f2ea6c093980ca55 MISC metadata.xml 248 RMD160 529d56c0d04b30a5cec5675e3104bd26911a7666 SHA1 f4fabea23c086a1f70709f74e2f4eb083e2c78aa SHA256 f3c501f041eb7ea6edcd5adfe691133e8c9070f0d7cf7edb4774fce9d496b16e diff --git a/net-irc/atheme/atheme-5.0.1.ebuild b/net-irc/atheme/atheme-5.0.1.ebuild --- a/net-irc/atheme/atheme-5.0.1.ebuild +++ b/net-irc/atheme/atheme-5.0.1.ebuild @@ -4,7 +4,7 @@ EAPI="3" -inherit autotools base eutils flag-o-matic +inherit autotools eutils flag-o-matic perl-module MY_P=${PN}-services-${PV} DESCRIPTION="A portable and secure set of open-source and modular IRC services" @@ -14,7 +14,7 @@ SRC_URI="http://atheme.net/downloads/${M LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug largenet ldap pcre profile ssl" +IUSE="debug largenet ldap pcre perl profile ssl" RDEPEND="dev-libs/libmowgli ldap? ( net-nds/openldap ) @@ -39,18 +39,27 @@ src_prepare() { epatch "${FILESDIR}"/${P}-ldap-as-needed.patch epatch "${FILESDIR}"/${P}-depend-parallel.patch - # fix atheme's sorry attempt at ``FHS paths'': - sed -i -e 's;\(DATADIR=.*\)lib/;\1;' configure.ac || die + # fix docdir + find -regex '.*/Makefile\..*in' \ + | xargs sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' \ + || die + + # basic logging config directive fix + sed -i -e 's;var/\(.*\.log\);\1;g' dist/* || die eaclocal -I m4 eautoheader eautoconf + + # QA against bundled libs + rm -rf libmowgli || die } src_configure() { econf --enable-fhs-paths \ --sysconfdir="${EPREFIX}"/etc/${PN} \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --localstatedir="${EPREFIX}"/var \ $(use debug || echo --enable-propolice) \ $(use_enable largenet large-net) \ $(use_with ldap) \ @@ -59,14 +68,36 @@ src_configure() { $(use_enable ssl) } +src_compile() { + emake || die + emake -C contrib || die +} + src_install() { emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" -C contrib install || die insinto /etc/${PN} for conf in dist/*.example; do newins ${conf} $(basename ${conf} .example) || die "installing ${conf/.example//}" done - fowners -R root:atheme /etc/atheme/ \ - /var/lib/{run/,log/,}${PN} || die + fowners -R root:atheme /etc/atheme || die + fowners atheme:atheme /var/{lib,run,log}/${PN} || die + fperms -R 640 /etc/atheme || die + fperms 750 /etc/atheme /var/{lib,run,log}/${PN} || die + + newinitd "${FILESDIR}"/${PN}.initd atheme || die + + # contributed scripts and such: + insinto /usr/share/doc/${PF}/contrib + doins contrib/*.{pl,php,py,rb} || die + # various conversion programs + doins contrib/{anope_convert.c,ircs_crypto_trans.c} || die + + if use perl; then + perlinfo + insinto "${VENDOR_LIB}" + doins -r contrib/Atheme{,.pm} || die + fi } \ No newline at end of file diff --git a/net-irc/atheme/files/atheme.initd b/net-irc/atheme/files/atheme.initd new file mode 100644 --- /dev/null +++ b/net-irc/atheme/files/atheme.initd @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +depend() { + need net +} + +start() { + ebegin "Starting ${SVSNAME}" + start-stop-daemon --start --quiet --chuid atheme --exec /usr/bin/atheme-services + eend $? "Failed to start ${SVSNAME}" +} + +stop() { + ebegin "Stopping ${SVSNAME}" + start-stop-daemon --stop --quiet --pidfile /var/run/atheme/atheme.pid + eend $? "Failed to stop ${SVSNAME}" +}