Version bump to 7.0.0 and fix a possible bug in the live ebuild.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

5 files changed, 150 insertions, 8 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index ed869a53bf82..d6e846c68b00 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.39 2012/04/20 02:36:07 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.40 2012/04/20 02:41:42 jdhore Exp $
+
+*atheme-services-7.0.0 (20 Apr 2012)
+
+  20 Apr 2012; Jeff Horelick <jdhore@gentoo.org> +atheme-services-7.0.0.ebuild,
+  +files/atheme-services-7.0.0-perl-build-fix.patch,
+  atheme-services-9999.ebuild:
+  Version bump to 7.0.0 and fix a possible bug in the live ebuild.
 
   20 Apr 2012; Jeff Horelick <jdhore@gentoo.org>
   -atheme-services-7.0.0_alpha11.ebuild, -atheme-services-7.0.0_alpha9.ebuild,
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index a15b602bbe4e..53cc64cfbbb7 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,8 +1,11 @@
 AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595
 AUX atheme-services-6.0.9-cracklib-automagic.patch 2806 RMD160 e2915f4fab7aea2d4a512ce462e8bf7fda08cb80 SHA1 8c1f28b6446e66355171c0e9badcc6424144d42a SHA256 810509891a461b2d6701c8f48519d70436cba698bf0ab098ab02cef13f0a2619
+AUX atheme-services-7.0.0-perl-build-fix.patch 576 RMD160 be33ab1e8703c9e9a068e4bb03d5f5477a875d89 SHA1 e3eae034478efe4a8294af2d23a78c188d74b066 SHA256 c1bf9de2808769d42b2dccf8ed46bb135edf2cf98994ad81aa9555e8eef05bd1
 AUX atheme-services.initd 975 RMD160 83486b35d148bab6f4b611d62fb18da63846a966 SHA1 bedd35acca25fad59ecd067709cfe85c0ba9798d SHA256 0cdcfb95d2399e132364127429618b44ce1830a61af0a5dc5bce1179b3810f75
 DIST atheme-services-6.0.10.tar.bz2 897748 RMD160 e7e1e606cb29c426568d462f6afab4709a1c2124 SHA1 7b38b5f99cf0f2dab6c19557514cc5a6a8ca0d35 SHA256 9a2b3954316d29ae0cd546edc9c2b6169bae448f982dbd76ca3efd84c271d0c8
+DIST atheme-services-7.0.0.tar.bz2 1058631 RMD160 09ab3d5f7edcc74416e0044bda9cd5885d562011 SHA1 6ce077437396e201766b35c48d42647e728a8120 SHA256 d02d4a3a3a3fe244e4c49d68a0734ed76a6f4560545bc23f06bf696dc0b109cc
 EBUILD atheme-services-6.0.10.ebuild 2790 RMD160 2a330313232182bafda51c6d0e0578ba9f363b09 SHA1 abcf4344bd09d9d10c1215e0c688692fa27cdc38 SHA256 a098ad6ac52ee1b6f255ad01a4815d9b7302d312a88d0d7204b5e5b33d68120b
-EBUILD atheme-services-9999.ebuild 3034 RMD160 d03cd2e7c63d0a87af9866542de20c4d08eaf469 SHA1 1e3caa9b0a6a900abd4bb80f85fb38966a854a82 SHA256 08d88d137d85ee7c01814bbf638894705908fb4a69a13e68c25e158a0edbb203
-MISC ChangeLog 8173 RMD160 88adda7a83246a1ce25844d2373a866084fabbd6 SHA1 4d19b433148d2a0c98a832136b045a18e68440d2 SHA256 0b807a88558f9497a0e94f3774dfcd4301a4e094cd28e6d7d1df5ddfb7f35486
+EBUILD atheme-services-7.0.0.ebuild 3111 RMD160 e78fdd2fc1c490d77571d9f6fd95e5078b068e28 SHA1 c9cb226f26f36305055b161a05ba2ec97c6078ac SHA256 f0f019e1c6adddc35183101d39f87eff5db3126d335f625498b71b6e5cacf9ef
+EBUILD atheme-services-9999.ebuild 3026 RMD160 a7abcdfd11e6195d430bdc3baa07b9328c5a5bcd SHA1 ff04542d3834c5235fa91aadc671816ffe436070 SHA256 9f4da821133f8415252fb7049e9595dd8baa0417ef0aeeb40212997feeff1235
+MISC ChangeLog 8443 RMD160 8e3d9bf8ec9eed1f1e7cfb5cb01e7c3da300b950 SHA1 b66075c7ffaa137df3718adf2e1f0e7adc9f92ff SHA256 74e3c54d3ad73476210cd92402ebf7aceb8e2976ba5ffcff8d1a3705c88aadc1
 MISC metadata.xml 771 RMD160 6681a3e8f489ae5a5b0ae882a11d423b932f0081 SHA1 07abec75deb6154fc71a3ff5cf9057d3ce713adb SHA256 a837c036193dc300db84f5539f463723abaa14e1fb15ca6314b7e850fdfac460
diff --git a/net-irc/atheme-services/atheme-services-7.0.0.ebuild b/net-irc/atheme-services/atheme-services-7.0.0.ebuild
new file mode 100644
index 000000000000..ce2d3003490c
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-7.0.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/04/20 02:41:42 jdhore Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic perl-module
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND=">=dev-libs/libmowgli-2.0.0:2
+	cracklib? ( sys-libs/cracklib )
+	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"
+
+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() {
+	# Fix broken version detection
+	sed -i -e 's/2.0.0-alpha1/2.0.0/' configure.ac || die
+	eautoconf
+
+	# 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
+
+	# Fix a bug with compilation of the perl stuff.
+	epatch "$FILESDIR"/${P}-perl-build-fix.patch
+
+	# QA against bundled libs
+	rm -rf libmowgli-2 || die
+}
+
+src_configure() {
+	# perl scriping module support is also broken in 7.0.0. Yay for QA failures.
+	econf \
+		atheme_cv_c_gcc_w_error_implicit_function_declaration=no \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--disable-warnings \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_with perl) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake V=1
+}
+
+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}
+	mv "${ED}"/usr/bin/{,atheme-}dbverify || die
+
+	# 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/atheme-services-9999.ebuild b/net-irc/atheme-services/atheme-services-9999.ebuild
index 440663628da6..8bad8a773657 100644
--- a/net-irc/atheme-services/atheme-services-9999.ebuild
+++ b/net-irc/atheme-services/atheme-services-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-9999.ebuild,v 1.1 2012/02/21 00:11:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-9999.ebuild,v 1.2 2012/04/20 02:41:42 jdhore Exp $
 
 EAPI=4
 
-inherit git-2 user flag-o-matic perl-module
+inherit git-2 user eutils flag-o-matic perl-module
 
 MY_P=${P/_/-}
 
@@ -60,9 +60,6 @@ src_prepare() {
 	# because it only contains a git submodule
 	# and removing it MAY break everything.
 	#rm -rf libmowgli-2 || die
-
-	# Get useful information into build.log
-	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
 }
 
 src_configure() {
@@ -84,6 +81,10 @@ src_configure() {
 		$(use_enable ssl)
 }
 
+src_compile() {
+	emake V=1
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
@@ -104,6 +105,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
+	mv "${ED}"/usr/bin/{,atheme-}dbverify || die
+
 	# contributed scripts and such:
 	insinto /usr/share/doc/${PF}/contrib
 	doins contrib/*.{c,pl,php,py,rb}
diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch b/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch
new file mode 100644
index 000000000000..196034e4ef0d
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/scripting/perl/Makefile b/modules/scripting/perl/Makefile
+index b7e4dbd..bce7584 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) -DPERL_MODDIR='"$(plugindir)"'
++CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) -DPERL_MODDIR=\"$(plugindir)\"
+ CFLAGS += $(PLUGIN_CFLAGS)
+ LDFLAGS += $(PLUGIN_LDFLAGS) $(PERL_LIBS)
+ LIBS +=	-L../../../libathemecore -lathemecore ${LDFLAGS_RPATH}