Version bump on 7.0 branch.

(Portage version: 2.2.0_alpha116/cvs/Linux i686)

3 files changed, 9 insertions, 112 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index 26972f131084..428576fcb2af 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2012/07/12 19:27:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.50 2012/07/12 21:36:20 jdhore Exp $
+
+*atheme-services-7.0.4 (12 Jul 2012)
+
+  12 Jul 2012; Jeff Horelick <jdhore@gentoo.org> +atheme-services-7.0.4.ebuild,
+  -atheme-services-7.0.1.ebuild, -atheme-services-7.0.2.ebuild:
+  Version bump on 7.0 branch.
 
   12 Jul 2012; Jeff Horelick <jdhore@gentoo.org> -atheme-services-6.0.10.ebuild:
   Remove old.
diff --git a/net-irc/atheme-services/atheme-services-7.0.2.ebuild b/net-irc/atheme-services/atheme-services-7.0.2.ebuild
deleted file mode 100644
index ddf9b3e20735..000000000000
--- a/net-irc/atheme-services/atheme-services-7.0.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.2.ebuild,v 1.1 2012/05/15 08:31:15 jdhore Exp $
-
-EAPI=4
-
-inherit 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}
-	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() {
-	# 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-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-7.0.1.ebuild b/net-irc/atheme-services/atheme-services-7.0.4.ebuild
index a832366e1f39..54a10782f03c 100644
--- a/net-irc/atheme-services/atheme-services-7.0.1.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.0.4.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.1.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.4.ebuild,v 1.1 2012/07/12 21:36:20 jdhore Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic perl-module
+inherit eutils flag-o-matic perl-module user
 
 DESCRIPTION="A portable and secure set of open-source and modular IRC services"
 HOMEPAGE="http://atheme.net/"