Bump to atheme-7.0.0_alpha6 which has perl scripting support.

Package-Manager: portage-2.2.0_alpha46-r1/cvs/Linux x86_64

4 files changed, 179 insertions, 15 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index 072b2df93bcb..9fab8b66c597 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/atheme-services
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.9 2011/07/22 03:22:12 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.10 2011/07/27 15:11:36 binki Exp $
+
+*atheme-services-7.0.0_alpha6 (27 Jul 2011)
+
+  27 Jul 2011; Nathan Phillip Brink <binki@gentoo.org>
+  +atheme-services-7.0.0_alpha6.ebuild,
+  +files/atheme-services-7.0.0_alpha6-destdir-perl.patch:
+  Bump to atheme-7.0.0_alpha6 which has perl scripting support.
 
 *atheme-services-6.0.8-r2 (22 Jul 2011)
 
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 1c5d2400f913..647c08f5ff82 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -2,25 +2,28 @@
 Hash: SHA256
 
 AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595
+AUX atheme-services-7.0.0_alpha6-destdir-perl.patch 2001 RMD160 2e90360f3ee805cc48d0a7deea1d4b0c2c975c9f SHA1 335b4022dcc7faad0aced18df9d373f7a252c7ee SHA256 3ffa46e34cf081c11ab7e029a9d1af9f03c6e1263f1f45def578d00761788f6e
 AUX atheme-services.initd 957 RMD160 e28c12ab60e8d5835c7c2e004e366b136d90aa31 SHA1 40ebacb57dcdebfaff54093863a573c4bdbc40be SHA256 0dae7f602487568054fe4a75961899c7ea428ee331d2a17020aa1cf1dd32fbaf
 DIST atheme-services-6.0.8.tar.bz2 860407 RMD160 31c1ba46ee5ede98108b51970bde134b259f1b3b SHA1 d201a41592fe0137e00625d7d6ed99fd79a752a7 SHA256 7dffcf8e768ca442d1fcc2b0e3031c41e34f6b3d8ee47164f84f20cb30515c24
+DIST atheme-services-7.0.0-alpha6.tar.bz2 938041 RMD160 47f21874c96cd11908748cf56c7b22a13d8d6b48 SHA1 bd8252cb898fb56df27c2f83faf9131d7f0443a7 SHA256 69c3b8e2b0cdae71aea393c1f0f111234ef177d9922fb707c95bf00253fb6b16
 EBUILD atheme-services-6.0.8-r2.ebuild 2703 RMD160 4a2c06940599531be1dca72f2627a1b57f68f456 SHA1 611621b6f8aadf0703ed7b298875a30a278ce42d SHA256 9613151cc34120bc9992e955464a651b8da3c68c1a9b6e0e636860faf0b0b3bd
-MISC ChangeLog 2624 RMD160 4a69dea808f3a21cf1f3dc8b9bbe8ab405d35a55 SHA1 808bda6e013c1a56d75b58a0e9ea3aec0d265780 SHA256 fcaf1ca850752081d05dbaf036d7a59e994a48a52b64f7cdd21aa513ef55c52d
+EBUILD atheme-services-7.0.0_alpha6.ebuild 2797 RMD160 47ef02aec605802263e174b0c88174bd950129ff SHA1 f1b28f49a0dfc07a67959aed7e451e26fd69389b SHA256 543bdbcee1efe8b1b71428af4264876d6c2a15bba130461e93a1944d88d31d1f
+MISC ChangeLog 2888 RMD160 d1b5befcd7ff0cdac007960994f916bac071ec19 SHA1 39220715e0bab1869fe28ee55033808b4608b334 SHA256 3a012a153aad60582a64a603e4bf0728bb4a25a54bb6c3609fdc6f1df4902c75
 MISC metadata.xml 522 RMD160 62256e4afba65ef587fb4314adeeb178b57246c0 SHA1 6765fd4304513a1aca8ba55294f417e11f1a4c8d SHA256 0eb4b26200c6ae7b351c45b9744c0bedd49e2de925f09161af89e5aefb8a5dcf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOKO1MAAoJEHQ6UuhrqBBQfxsP/0fERrK9KtZTMWNJdqQcrj3T
-sTeCDH3LdYps6FoyAfXehQtK0oauMpm++D5iRqdpOR7hKXARFOSwrX2hldWLbvsO
-spXxiNyesRow0ne4SFjhAF+WlX1CKsxFCKwIIPpNLGTMjQfgpdrpuVOA+TOW3rA7
-C6IzoGXREwim8iWe++d+NTpC7twxO8cDQLV0PoXlNHwESVk3UEjQG3JPE3LI6Tym
-Q+ZjRjfKjxmi33TBbdev19hDAhSEJCT0Xa+TPmUffRMvUI5q9WTvVV8fNHxe+t4l
-E/ccg2f/jPr8Q3Dpk8/DkVlV9pU6xaYn+tFmmorKBhFhygLGBRI+TdzGz9O4GL5q
-Hw1/BHbmLU3WuO9hABPxOER0HsEytOnAwbkaJXZLIHca7P6SYXUniOzaXli/gViS
-Gg3W/1RR6J33rs7UPHu1Fcpo3ZAlAEJWtuHTLq+XGReVcKU+ViaN39avGHsDi/QK
-1UEDayalzATpXIXi2RZ0gYJ4MtP+Gfk5lfTPQokgt0itC69D5Yf3sYV6Mus0Ocub
-gSklo8eCpfILPfYpxPKUEfY8wjq4G2hQ4Wgldx6Ho2IaZhIuXvOkpdP2RChUdDl1
-RQzRYZKJXq0wRHIc9svkGUSB6P4Ay4OSxxD9WiZ46YpLA8udmXVCmLK9Jtx4yxkD
-QWqSLxqxsxaTfZ5M4En+
-=S3uq
+iQIcBAEBCAAGBQJOMCsaAAoJEHQ6UuhrqBBQCHAQAINLy4QSTouCFyePCywHMeF2
+2Q9tiJ09EqkIzUnpGdmtZdyji193VbN08TlwfQRQmDwxr5IXcWwtvqHen2XJlAqD
+B5/GvhPsAmDfbb4Km/NgvLRHuap9bRXN9X29Xa2nXhQFS+SpiIj2MaAQks9rhXg7
+bq9YAzZFUwhg88MKQuUSZ/u8AAh1MYZjA7PGmfXUXfA49deYE051YiRl4BoRWFrf
+DQxDmcA6hQB3H1qWMfzCM/olU1/gsGwHOqiVKIWUj48XPNhobR9XmfFRWJYYpuIt
+NZze/n0boC/9yrxZMuHMv5mL8LJ+Q1s474KLL4i/uyyhcUa2DRF6U60NZ6J76Ton
+FC/Brqfbu8q3cfRCkU3e/qKB/RxgYPzeTkey4iCZtddj+w32boKrWihYGdjdZDYZ
+r5dPD65sOz2Y6txweYSn5UeMNeAbNgHDs9WmDoTimGnJclEjigwDbJUIKaDjxWe7
+BtZ93hNN7S438TwaPjX1LsQ3V+I0yepZxlTjBDdm1PEU7i+IVG/0nEy76jHNp2Jq
+MTbxobAxFxD5HkyCwt9/HMwolIZtReea90AFSeYQHrgxnKFI0K60O9sI6+AN2siW
+BZTdm23wmA/DSsakszVxsAyNTlFyp3ewf4TsYSXl/hPX2/CvnnQoSZTbTmJr5gcV
+Kju/oP3iGhk4xCKiMLvz
+=dtgJ
 -----END PGP SIGNATURE-----
diff --git a/net-irc/atheme-services/atheme-services-7.0.0_alpha6.ebuild b/net-irc/atheme-services/atheme-services-7.0.0_alpha6.ebuild
new file mode 100644
index 000000000000..2ec81873137b
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-7.0.0_alpha6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha6.ebuild,v 1.1 2011/07/27 15:11:36 binki Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic perl-module prefix
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND=">=dev-libs/libmowgli-0.9.50
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/perl )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-destdir-perl.patch
+
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs
+	rm -rf libmowgli || die
+
+	# Get useful information into build.log
+	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with perl) \
+		$(use_with pcre) \
+		$(use_enable ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}
diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha6-destdir-perl.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha6-destdir-perl.patch
new file mode 100644
index 000000000000..b709e73c922e
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha6-destdir-perl.patch
@@ -0,0 +1,46 @@
+diff --git a/modules/scripting/perl/Makefile b/modules/scripting/perl/Makefile
+index ec006ba..b7e4dbd 100644
+--- a/modules/scripting/perl/Makefile
++++ b/modules/scripting/perl/Makefile
+@@ -12,7 +12,7 @@ include ../../../buildsys.mk
+ 
+ plugindir = $(MODDIR)/modules/scripting
+ 
+-CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS)
++CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) -DPERL_MODDIR='"$(plugindir)"'
+ CFLAGS += $(PLUGIN_CFLAGS)
+ LDFLAGS += $(PLUGIN_LDFLAGS) $(PERL_LIBS)
+ LIBS +=	-L../../../libathemecore -lathemecore ${LDFLAGS_RPATH}
+@@ -28,11 +28,11 @@ perlxsi.c:
+ 	perl -MExtUtils::Embed -e xsinit
+ 
+ install-extra:
+-	${MKDIR_P} ${plugindir}/lib
+-	${INSTALL} -m644 lib/*.pl lib/*.pm ${plugindir}/lib
+-	${MKDIR_P} ${plugindir}/lib/Atheme
+-	${INSTALL} -m644 lib/Atheme/*.pm ${plugindir}/lib/Atheme
+-	${MKDIR_P} ${plugindir}/lib/Atheme/Internal
+-	${INSTALL} -m644 lib/Atheme/Internal/*.pm ${plugindir}/lib/Atheme/Internal
+-	${MKDIR_P} ${plugindir}/examples
+-	${INSTALL} -m644 examples/*.pl ${plugindir}/examples
++	${MKDIR_P} '${DESTDIR}'${plugindir}/lib
++	${INSTALL} -m644 lib/*.pl lib/*.pm '${DESTDIR}'${plugindir}/lib
++	${MKDIR_P} '${DESTDIR}'${plugindir}/lib/Atheme
++	${INSTALL} -m644 lib/Atheme/*.pm '${DESTDIR}'${plugindir}/lib/Atheme
++	${MKDIR_P} '${DESTDIR}'${plugindir}/lib/Atheme/Internal
++	${INSTALL} -m644 lib/Atheme/Internal/*.pm '${DESTDIR}'${plugindir}/lib/Atheme/Internal
++	${MKDIR_P} '${DESTDIR}'${plugindir}/examples
++	${INSTALL} -m644 examples/*.pl '${DESTDIR}'${plugindir}/examples
+diff --git a/modules/scripting/perl/perl_module.c b/modules/scripting/perl/perl_module.c
+index ba93cdf..dfa8622 100644
+--- a/modules/scripting/perl/perl_module.c
++++ b/modules/scripting/perl/perl_module.c
+@@ -24,7 +24,7 @@ DECLARE_MODULE_V1
+  * Definitions:
+  *  PERL_INIT_FILE is the perl script that is used to boot the Atheme interface.
+  */
+-#define PERL_INIT_FILE PREFIX "/modules/scripting/lib/init.pl"
++#define PERL_INIT_FILE PERL_MODDIR "/lib/init.pl"
+ 
+ /*
+  * External functions: