Merge stable keywords from -r0; Drop old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)

3 files changed, 7 insertions, 69 deletions

diff --git a/www-apache/libapreq2/ChangeLog b/www-apache/libapreq2/ChangeLog
index d41d0bd3b91c..94bd19322955 100644
--- a/www-apache/libapreq2/ChangeLog
+++ b/www-apache/libapreq2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/libapreq2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/ChangeLog,v 1.49 2014/08/24 16:45:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/ChangeLog,v 1.50 2014/08/28 18:48:20 zlogene Exp $
+
+  28 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> -libapreq2-2.13.ebuild,
+  libapreq2-2.13-r1.ebuild:
+  Merge stable keywords from -r0; Drop old.
 
 *libapreq2-2.13-r1 (24 Aug 2014)
 
diff --git a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
index e5a300f5022c..65962825c12f 100644
--- a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/libapreq2-2.13-r1.ebuild,v 1.1 2014/08/24 16:45:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/libapreq2-2.13-r1.ebuild,v 1.2 2014/08/28 18:48:20 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://httpd.apache.org/apreq/"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="perl"
 
 DEPEND="${DEPEND}
diff --git a/www-apache/libapreq2/libapreq2-2.13.ebuild b/www-apache/libapreq2/libapreq2-2.13.ebuild
deleted file mode 100644
index 7c81db214b4e..000000000000
--- a/www-apache/libapreq2/libapreq2-2.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/libapreq2/libapreq2-2.13.ebuild,v 1.5 2011/07/24 13:35:46 xarthisius Exp $
-
-inherit apache-module perl-module multilib
-
-DESCRIPTION="A library for manipulating client request data via the Apache API"
-SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
-HOMEPAGE="http://httpd.apache.org/apreq/"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="perl"
-
-DEPEND="${DEPEND}
-	perl? (
-		>=dev-perl/ExtUtils-XSBuilder-0.23
-		virtual/perl-version
-		>=www-apache/mod_perl-2
-	)"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so"
-APACHE2_MOD_CONF="76_mod_apreq"
-APACHE2_MOD_DEFINE="APREQ"
-DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST"
-
-need_apache2
-
-pkg_setup() {
-	perl-module_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/libapreq2-2.08-doc.patch
-
-	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4
-	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4
-	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure
-}
-
-src_compile() {
-	econf \
-		--with-apache2-apxs=${APXS} \
-		$(use_enable perl perl-glue)
-	emake || die "emake failed"
-}
-
-src_install() {
-	apache-module_src_install
-
-	make DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed"
-	doman docs/man/man3/*.3
-
-	fixlocalpod
-
-	for i in $(find "${D}" -type f -not -name '*.so'); do
-		if file ${i} | grep -i " text"; then
-			sed -i -e "s:${D}:/:g" ${i}
-		fi
-	done
-}