Version bump, bug #368743 wrt Max Nokhrin and Denis Kaganovich

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 140 insertions, 12 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index eeccc32809ef..5beb6e9bbdd5 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.92 2011/07/22 13:40:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.93 2011/09/01 07:58:39 pva Exp $
+
+*apache-tools-2.2.20 (01 Sep 2011)
+
+  01 Sep 2011; Peter Volkov <pva@gentoo.org> +apache-tools-2.2.20.ebuild,
+  +files/apache-tools-2.2.20-Makefile.patch:
+  Version bump, bug #368743 wrt Max Nokhrin and Denis Kaganovich
 
   22 Jul 2011; Jeroen Roovers <jer@gentoo.org> apache-tools-2.2.17.ebuild:
   Stable for HPPA (bug #360625).
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 1067f12f7de6..09ec4d92f395 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX apache-tools-2.2.20-Makefile.patch 1621 RMD160 9932b9ec5a8aa63628c4aefed3437c0eded71b9c SHA1 50b81e7caeb2c128de377d682d95ca831be44b0a SHA256 bfed1a3d5e07766531a04c4752500c69dd60be45b71690c607383e2dc09e140d
 AUX apache-tools-Makefile.patch 1528 RMD160 a5f5431ab0170f07d4fd7723a93fb38db1030fa3 SHA1 863110419b1fa393d36dfbcd0adf1da827b86f76 SHA256 668caee92c1edd5559a0975c92bd2578ad0359f8835d51a9f0041f4b9e89564b
 DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
 DIST httpd-2.2.15.tar.bz2 4959582 RMD160 e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfdf SHA1 5f0e973839ed2e38a4d03adba109ef5ce3381bc2 SHA256 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7
 DIST httpd-2.2.16.tar.bz2 4775545 RMD160 2e6d7d1dae40905be7fdd793140f62cf58112095 SHA1 ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9 SHA256 9457d57a6bea15ce5bde83c88803c030953b99bdd0fbae65854adff527ed4c52
 DIST httpd-2.2.17.tar.bz2 4951247 RMD160 4a2f16f2891094d4176565fadf0e8fcadf7dbaff SHA1 5c9b44620dee449a86ba1bcba1715033c2c26b08 SHA256 868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04
+DIST httpd-2.2.20.tar.bz2 5174611 RMD160 299d1a8a9f3a6eb925d63ce96fa8ea4a06ec1f17 SHA1 c8f00a505af6ed3f89f45b640217c388f5cd32b0 SHA256 1ee914855249b09d9cd2e20e98a0ab02f15c270fe277d4a5c9b62975479fc81e
 EBUILD apache-tools-2.2.14.ebuild 2258 RMD160 2efba97f354d6a9eaee14b1ccce2c727fa99a7da SHA1 75ab4754ab0b5f51279fdfb13ef7d8df38fb4f28 SHA256 950671fe3809bfd809298c4bd320bb364d5ab92d3a15f0ea5f1b5313aa6253dd
 EBUILD apache-tools-2.2.15.ebuild 2258 RMD160 59724ab7bcdfba7b11df8e6c9d8cd9031e5b8009 SHA1 3b5d911a704aad2265c00979fa51d63b63bc9639 SHA256 e111039c13003aaa2b742e3b3331377d5e603f918102ab7816a1fdb57ac6e08b
 EBUILD apache-tools-2.2.16.ebuild 2258 RMD160 6320170a229afd82f5fb22f93a40a28bffda8796 SHA1 9dbda888e500f59f70a0cd104c65337134b98c13 SHA256 06f0709af7f0ac17065f83c8b682a59e576b9d8644ca789581dc66a7607db564
 EBUILD apache-tools-2.2.17.ebuild 2255 RMD160 b41f63e196b47409806ff15b05e0c2d1da6fe7ba SHA1 43ca70737bc80d08cc766d8411caee5eab68eb35 SHA256 57340284a76b4e01c1f58e8849f5c6bf4180ec66240cb3320c30362898051503
-MISC ChangeLog 11908 RMD160 931eb121d1b8dc429bb00b9337681140ee414334 SHA1 dba0e6ad9a4942483f0e21d4f6fc4cb05da5ca4c SHA256 00df995e67105eee3b94361762dacd0952d5460a08e9c4740b35d210d76bca67
+EBUILD apache-tools-2.2.20.ebuild 2181 RMD160 46e58c86f119012f2553e82c46e6392ef83d2cbb SHA1 826b7d096548bb3b17ccca6331ffacc6feb7f293 SHA256 c3a4d5a86e5e9cdb4d37d33258c00f0e3f9dce012f08033ec6645c9941d2e094
+MISC ChangeLog 12129 RMD160 d67bae097f6b2dba47e8eb197dbd1543acd2e6f0 SHA1 ddfa9a7d43a9e71545113c73c1c3761fbf4dc441 SHA256 aac60877e4366413e03f2a0d4728bb5688a6f88796d3781a508c55c30a7a338c
 MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4pfcsACgkQVWmRsqeSphOI3QCeNnOGOf71dSosJkM7EjGq93Vz
-RBQAn0bPXF3iXAdD2j5+R+x6KVeDSVHf
-=wi8/
------END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.20.ebuild b/app-admin/apache-tools/apache-tools-2.2.20.ebuild
new file mode 100644
index 000000000000..a19c708cceeb
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.20.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.20.ebuild,v 1.1 2011/09/01 07:58:39 pva Exp $
+
+EAPI="4"
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/libpcre
+	ssl? ( dev-libs/openssl )
+	!<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+	# Apply these patches:
+	# (1)	apache-tools-2.2.20-Makefile.patch:
+	#		- fix up the `make install' for support/
+	#		- remove envvars from `make install'
+	epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	append-ldflags $(no-as-needed)
+
+	use ssl && myconf+=" --with-ssl=/usr --enable-ssl"
+
+	# econf overwrites the stuff from config.layout, so we have to put them into
+	# our myconf line too
+	econf \
+		--sbindir=/usr/sbin \
+		--with-z=/usr \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-pcre=/usr \
+		${myconf}
+}
+
+src_compile() {
+	cd support || die
+	emake
+}
+
+src_install () {
+	cd support || die
+
+	make DESTDIR="${D}" install
+
+	# install manpages
+	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${D}"/usr/sbin/ >/dev/null
+	for i in *; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+	popd "${D}"/usr/sbin/ >/dev/null
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym /usr/sbin/ab /usr/sbin/ab-ssl
+		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
+	fi
+
+	# make htpasswd accessible for non-root users
+	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
+	dosym /usr/sbin/htdigest /usr/bin/htdigest
+
+	dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
new file mode 100644
index 000000000000..0ac4885feed6
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
@@ -0,0 +1,41 @@
+=== modified file 'support/Makefile.in'
+--- support/Makefile.in	2011-09-01 06:33:22 +0000
++++ support/Makefile.in	2011-09-01 06:43:51 +0000
+@@ -1,9 +1,10 @@
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
+-	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
++	logresolve.pl phf_abuse_log.cgi split-logfile
+ 
+ CLEAN_TARGETS = suexec
+ 
+-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
++PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \
++	$(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage
+ TARGETS  = $(PROGRAMS)
+ 
+ PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+@@ -12,22 +13,13 @@
+ include $(top_builddir)/build/rules.mk
+ 
+ install:
+-	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+-	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+-	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+-	@for i in apxs apachectl dbmmanage; do \
++	@for i in $(PROGRAMS) ; do \
+ 	    if test -f "$(builddir)/$$i"; then \
+ 	        cp -p $$i $(DESTDIR)$(sbindir); \
+ 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ 	    fi ; \
+ 	done
+-	@if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
+ 
+ htpasswd_OBJECTS = htpasswd.lo
+ htpasswd: $(htpasswd_OBJECTS)
+