From 9019ecc0a29b57e62d60deb42fc9f2c1905d0ea7 Mon Sep 17 00:00:00 2001 From: Jeff Horelick Date: Tue, 15 May 2012 08:31:15 +0000 Subject: Version bumps on the 6.0 (LTS) and 7.0 branches. (Portage version: 2.2.0_alpha105/cvs/Linux i686) --- net-irc/atheme-services/ChangeLog | 9 +- .../atheme-services/atheme-services-6.0.11.ebuild | 105 +++++++++++++++++++ .../atheme-services/atheme-services-7.0.0.ebuild | 116 --------------------- .../atheme-services/atheme-services-7.0.2.ebuild | 109 +++++++++++++++++++ 4 files changed, 222 insertions(+), 117 deletions(-) create mode 100644 net-irc/atheme-services/atheme-services-6.0.11.ebuild delete mode 100644 net-irc/atheme-services/atheme-services-7.0.0.ebuild create mode 100644 net-irc/atheme-services/atheme-services-7.0.2.ebuild (limited to 'net-irc/atheme-services') 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 +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 atheme-services-9999.ebuild: Make the -9999 ebuild clone the submodules too to fix the build since 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.0.ebuild deleted file mode 100644 index 325b91255a01..000000000000 --- a/net-irc/atheme-services/atheme-services-7.0.0.ebuild +++ /dev/null @@ -1,116 +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.0.ebuild,v 1.2 2012/05/03 06:27:14 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} - 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 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-7.0.2.ebuild b/net-irc/atheme-services/atheme-services-7.0.2.ebuild new file mode 100644 index 000000000000..ddf9b3e20735 --- /dev/null +++ b/net-irc/atheme-services/atheme-services-7.0.2.ebuild @@ -0,0 +1,109 @@ +# 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 +} -- cgit v1.2.3-65-gdbad