Version bumps on the 6.0 (LTS) and 7.0 branches.

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

4 files changed, 120 insertions, 13 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index 00080bcfe9e3..d4c93d9dfc5f 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.43 2012/05/13 06:27:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.44 2012/05/15 08:31:15 jdhore Exp $
+
+*atheme-services-6.0.11 (15 May 2012)
+*atheme-services-7.0.2 (15 May 2012)
+
+  15 May 2012; Jeff Horelick <jdhore@gentoo.org> +atheme-services-6.0.11.ebuild,
+  +atheme-services-7.0.2.ebuild, -atheme-services-7.0.0.ebuild:
+  Version bumps on the 6.0 (LTS) and 7.0 branches.
 
   13 May 2012; Jeff Horelick <jdhore@gentoo.org> atheme-services-9999.ebuild:
   Make the -9999 ebuild clone the submodules too to fix the build since
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index f199c94a5168..72d58306c9fd 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -3,11 +3,13 @@ AUX atheme-services-6.0.9-cracklib-automagic.patch 2806 RMD160 e2915f4fab7aea2d4
 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
+DIST atheme-services-6.0.11.tar.bz2 859123 RMD160 c01d835e6401e97f67d7647959b59b38297e9b1f SHA1 e6cb8156583c9daa4619cfee5e5e1cd8a38b7b2d SHA256 762bc717d4710d135f8654025c34c4fc431a6a8cf7345e994fbe800fa78a9f74
 DIST atheme-services-7.0.1.tar.bz2 1052229 RMD160 e2cc66e92456daf54bdcc5288efcedebd0c3dd5f SHA1 9616a6651a06f18d2b2c85e64c85be524643a917 SHA256 bc42b736e3a90c9e07ca1b0085e1dcadf7139d74453664f55aa8d963a3f79064
+DIST atheme-services-7.0.2.tar.bz2 1050575 RMD160 28ba758ef0dd60b31fe6261eb18b9c7a2eea46f7 SHA1 4cf363a067f8d9b0b01c999127748fa3995ad037 SHA256 a5eeb853b7d6206e4a01dd52a35f14e4a255cae95aa75d66c1e0ffe70625a2e0
 EBUILD atheme-services-6.0.10.ebuild 2789 RMD160 72094d3c2cacef0b54e967824d62c86780a44042 SHA1 bf521d203a281ba8967c770cce4c9f32eb83c0bc SHA256 6671f556262337aa56d5e1381bf163dc9e63f4d9395abfd92fbe1335bf080408
-EBUILD atheme-services-7.0.0.ebuild 3110 RMD160 6f3c90b31f4c9590cdf7b82d6ced9e37802b547b SHA1 1e13ba042998a47e0ffbbc64736e9deacee5f06f SHA256 584900b1dc847306dce55db809561747764bea7d667c23403b117af9750a2c48
+EBUILD atheme-services-6.0.11.ebuild 2791 RMD160 d50a64b500d2fa6a0bad6825963629fa2c7e1129 SHA1 9ac5c3abe3e01672f69d87d3d7177f91eb5832e0 SHA256 7b7fd115aebf9cf1e1640656aa8fa9f85968716b1b56109eea849b108513af6f
 EBUILD atheme-services-7.0.1.ebuild 2905 RMD160 8c5a2cde985ed2eb42dc907d2ad3522458433ded SHA1 ec45334e2d67ee0a9e6731a62215788dcabab02c SHA256 efd536afed578df4382d804f21338b907485804620bfccbea9504a30d0fc72ce
+EBUILD atheme-services-7.0.2.ebuild 2905 RMD160 8b6b5546ec90d6f53b31003487bd870ec581a45c SHA1 1b89231cd00d3d79e4ac5ca24049f46f05530ff2 SHA256 8823d421126a1266c4a044769f677674e3a05c3362fbdd93651d4247317c0ce2
 EBUILD atheme-services-9999.ebuild 3052 RMD160 e97c9a43e84bfc7dc2ce691afd099d583ddc8016 SHA1 c3f2ba7a732a21b7c98964e22112e39f28809256 SHA256 faf46a0b9b1cd2145274365c90b25a4a0fe68e76ab93c687940befb5f22b8c0d
-MISC ChangeLog 8994 RMD160 88d020669862ddd9027821da9aab4d1765bce2c4 SHA1 82696b2d40b733c21b77ee3025223919c2c4a6af SHA256 e9dc17fd56a7ffbb6f38eb506efc2194eeaa1dd3066349aec18d20cebc720154
+MISC ChangeLog 9267 RMD160 1dad97478f9624040d819536ebff4921415c974c SHA1 3414ca1eefc8cdd88f97b94608c37234e2572a71 SHA256 3b92b86f03ee8a19ce64fb61efb8de8ecd13875c768770eed8d365ec86221e89
 MISC metadata.xml 771 RMD160 6681a3e8f489ae5a5b0ae882a11d423b932f0081 SHA1 07abec75deb6154fc71a3ff5cf9057d3ce713adb SHA256 a837c036193dc300db84f5539f463723abaa14e1fb15ca6314b7e850fdfac460
diff --git a/net-irc/atheme-services/atheme-services-6.0.11.ebuild b/net-irc/atheme-services/atheme-services-6.0.11.ebuild
new file mode 100644
index 000000000000..98023fb67a85
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-6.0.11.ebuild
@@ -0,0 +1,105 @@
+# 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-6.0.11.ebuild,v 1.1 2012/05/15 08:31:15 jdhore Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic perl-module prefix
+
+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:0
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/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() {
+	epatch "${FILESDIR}"/${PN}-6.0.8-configure-disable.patch
+	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
+
+	# 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 cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(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/atheme-services-7.0.0.ebuild b/net-irc/atheme-services/atheme-services-7.0.2.ebuild
index 325b91255a01..ddf9b3e20735 100644
--- a/net-irc/atheme-services/atheme-services-7.0.0.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.0.2.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-7.0.0.ebuild,v 1.2 2012/05/03 06:27:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.2.ebuild,v 1.1 2012/05/15 08:31:15 jdhore Exp $
 
 EAPI=4
 
-inherit autotools eutils flag-o-matic perl-module
+inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="A portable and secure set of open-source and modular IRC services"
 HOMEPAGE="http://atheme.net/"
@@ -42,19 +42,12 @@ pkg_setup() {
 }
 
 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
 }