As older versions have a constant patchset, move that out to mirrors

(Portage version: 2.1.2_rc4-r8)

7 files changed, 64 insertions, 29 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 3f821c498c65..267c120831ae 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.254 2007/01/16 23:22:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.255 2007/01/16 23:59:56 jokey Exp $
+
+  16 Jan 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/openldap-2.1.27-db40.patch,
+  -files/openldap-2.1.27-perlthreadsfix.patch,
+  -files/openldap-2.1.30-autoconf-archived-fix.patch,
+  -files/openldap-2.1.30-autoconf25.patch,
+  -files/openldap-2.1.30-db40.patch, -files/openldap-2.1.30-glibc24.patch,
+  -files/openldap-2.1.30-m4_underquoted.patch,
+  -files/openldap-2.1.30-rpath.patch, -files/openldap-2.1.30-tests.patch,
+  -files/openldap-2.1.30-tls-activedirectory-hang-fix.patch,
+  -files/openldap-2.1.30-ximian_connector.patch,
+  -files/openldap-2.2.14-db40.patch,
+  -files/openldap-2.2.26-tls-fix-connection-test.patch,
+  -files/openldap-2.2.28-autoconf-archived-fix.patch,
+  -files/openldap-2.2.28-cleartext-passwords.patch,
+  -files/openldap-2.2.28-r1-configure.in-rpath.patch,
+  -files/openldap-2.2.28-tests.patch,
+  -files/openldap-2.2.28-ximian_connector.patch,
+  -files/openldap-2.3.27-CVE-2006-5779.patch, openldap-2.1.30-r10.ebuild,
+  openldap-2.2.28-r7.ebuild:
+  As older versions have a constant patchset, move that out to mirrors
 
 *openldap-2.3.32 (16 Jan 2007)
 
diff --git a/net-nds/openldap/files/digest-openldap-2.1.30-r10 b/net-nds/openldap/files/digest-openldap-2.1.30-r10
index afc64cb183fd..0740083a46c5 100644
--- a/net-nds/openldap/files/digest-openldap-2.1.30-r10
+++ b/net-nds/openldap/files/digest-openldap-2.1.30-r10
@@ -1,3 +1,6 @@
 MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
 RMD160 431aa798c6197530c17611b931f0169d7a53e831 openldap-2.1.30.tgz 2044673
 SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 openldap-2.1.30.tgz 2044673
+MD5 fe5206e373996ef75924c06755eaadd4 openldap-compatversions-patchset-1.0.tar.bz2 10547
+RMD160 7d6200e26fe8818934a94b4cf192f8e53df5dc2c openldap-compatversions-patchset-1.0.tar.bz2 10547
+SHA256 8b0a7b0c16601405a623012f84f9edba698cb708aea953da3d2f51da26d35c26 openldap-compatversions-patchset-1.0.tar.bz2 10547
diff --git a/net-nds/openldap/files/digest-openldap-2.2.28-r7 b/net-nds/openldap/files/digest-openldap-2.2.28-r7
index 39550e28ab46..d0638b631e3a 100644
--- a/net-nds/openldap/files/digest-openldap-2.2.28-r7
+++ b/net-nds/openldap/files/digest-openldap-2.2.28-r7
@@ -1,3 +1,6 @@
 MD5 b51db7328430b9cbe527696da726f1fb openldap-2.2.28.tgz 2630427
 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c openldap-2.2.28.tgz 2630427
 SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba openldap-2.2.28.tgz 2630427
+MD5 fe5206e373996ef75924c06755eaadd4 openldap-compatversions-patchset-1.0.tar.bz2 10547
+RMD160 7d6200e26fe8818934a94b4cf192f8e53df5dc2c openldap-compatversions-patchset-1.0.tar.bz2 10547
+SHA256 8b0a7b0c16601405a623012f84f9edba698cb708aea953da3d2f51da26d35c26 openldap-compatversions-patchset-1.0.tar.bz2 10547
diff --git a/net-nds/openldap/openldap-2.1.30-r10.ebuild b/net-nds/openldap/openldap-2.1.30-r10.ebuild
index dbc6dbc7389b..e40b2f0adb02 100644
--- a/net-nds/openldap/openldap-2.1.30-r10.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r10.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r10.ebuild,v 1.11 2007/01/16 23:22:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r10.ebuild,v 1.12 2007/01/16 23:59:56 jokey Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
 AT_M4DIR="./build"
 inherit autotools eutils ssl-cert
 
+PATCHSETVER=openldap-compatversions-patchset-1.0
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz
+	mirror://gentoo/${PATCHSETVER}.tar.bz2"
 
 LICENSE="OPENLDAP"
 SLOT="0"
@@ -39,6 +41,8 @@ DEPEND=">=sys-libs/ncurses-5.1
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-openldap )"
 
+PATCHDIR=${WORKDIR}/${PATCHSETVER}
+
 pkg_setup() {
 	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
 		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
@@ -61,12 +65,12 @@ src_unpack() {
 	# Fix up DB-4.0 linking problem
 	# remember to autoconf! this expands configure by 500 lines (4 lines to m4
 	# stuff).
-	epatch "${FILESDIR}"/${PN}-2.1.30-db40.patch
-	epatch "${FILESDIR}"/${PN}-2.1.30-tls-activedirectory-hang-fix.patch
+	epatch "${PATCHDIR}"/${PN}-2.1.30-db40.patch
+	epatch "${PATCHDIR}"/${PN}-2.1.30-tls-activedirectory-hang-fix.patch
 
 	# Security bug #96767
 	# http://bugzilla.padl.com/show_bug.cgi?id=210
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.26-tls-fix-connection-test.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.2.26-tls-fix-connection-test.patch
 
 	# supersedes old fix for bug #31202
 	cd "${S}"
@@ -80,27 +84,27 @@ src_unpack() {
 
 	# ximian connector 1.4.7 ntlm patch
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.1.30-ximian_connector.patch
+	epatch "${PATCHDIR}"/${PN}-2.1.30-ximian_connector.patch
 
 	#make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.1.30-autoconf25.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-autoconf25.patch
 
 	# fix AC calls bug #114544
-	EPATCH_OPTS="-p0 -d ${S}/build" epatch "${FILESDIR}"/${PN}-2.1.30-m4_underquoted.patch
+	EPATCH_OPTS="-p0 -d ${S}/build" epatch "${PATCHDIR}"/${PN}-2.1.30-m4_underquoted.patch
 
 	# make tests rpath ready
-	EPATCH_OPTS="-p0 -d ${S}/tests" epatch "${FILESDIR}"/${PN}-2.1.30-tests.patch
+	EPATCH_OPTS="-p0 -d ${S}/tests" epatch "${PATCHDIR}"/${PN}-2.1.30-tests.patch
 
 	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.1.30-autoconf-archived-fix.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-autoconf-archived-fix.patch
 
 	# CVE-2006-5779, bug #154349
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.3.27-CVE-2006-5779.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.3.27-CVE-2006-5779.patch
 
 	# reconf current for RPATH solve
 	libtoolize --copy --force
 	eaclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.1.30-rpath.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-rpath.patch
 	eautoconf || die "autoconf failed"
 }
 
diff --git a/net-nds/openldap/openldap-2.2.28-r7.ebuild b/net-nds/openldap/openldap-2.2.28-r7.ebuild
index 97153678d49f..525e9ee8780a 100644
--- a/net-nds/openldap/openldap-2.2.28-r7.ebuild
+++ b/net-nds/openldap/openldap-2.2.28-r7.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r7.ebuild,v 1.11 2007/01/16 23:22:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r7.ebuild,v 1.12 2007/01/16 23:59:56 jokey Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
 AT_M4DIR="./build"
 inherit autotools eutils flag-o-matic multilib ssl-cert toolchain-funcs
 
+PATCHSETVER=openldap-compatversions-patchset-1.0
 DESCRIPTION="LDAP suite of application and development tools"
 HOMEPAGE="http://www.OpenLDAP.org/"
-SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz
+	mirror://gentoo/${PATCHSETVER}.tar.bz2"
 
 LICENSE="OPENLDAP"
 SLOT="0"
@@ -39,6 +41,8 @@ DEPEND="sys-libs/ncurses
 	selinux? ( sec-policy/selinux-openldap )"
 RDEPEND="${DEPEND}"
 
+PATCHDIR=${WORKDIR}/${PATCHSETVER}
+
 # for tracking versions
 OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
 
@@ -101,14 +105,14 @@ src_unpack() {
 	# Fix up DB-4.0 linking problem
 	# remember to autoconf! this expands configure by 500 lines (4 lines to m4
 	# stuff).
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.14-db40.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.2.14-db40.patch
 
 	# supersedes old fix for bug #31202
 	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
 
 	# Security bug #96767
 	# http://bugzilla.padl.com/show_bug.cgi?id=210
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.26-tls-fix-connection-test.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.2.26-tls-fix-connection-test.patch
 
 	# ensure correct SLAPI path by default
 	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
@@ -123,31 +127,31 @@ src_unpack() {
 	ln -s shtool install.sh
 
 	# make files ready for new autoconf
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.1.30-autoconf25.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-autoconf25.patch
 
 	# fix AC calls bug #114544
-	EPATCH_OPTS="-p0 -d ${S}/build" epatch "${FILESDIR}"/${PN}-2.1.30-m4_underquoted.patch
+	EPATCH_OPTS="-p0 -d ${S}/build" epatch "${PATCHDIR}"/${PN}-2.1.30-m4_underquoted.patch
 
 	# make tests rpath ready
-	EPATCH_OPTS="-p0 -d ${S}/tests" epatch "${FILESDIR}"/${PN}-2.2.28-tests.patch
+	EPATCH_OPTS="-p0 -d ${S}/tests" epatch "${PATCHDIR}"/${PN}-2.2.28-tests.patch
 
 	# make autoconf-archive compatible
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.28-autoconf-archived-fix.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.2.28-autoconf-archived-fix.patch
 
 	# make autoconf-archive compatible
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.1.30-glibc24.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-glibc24.patch
 
 	# add cleartext passwords backport bug #112554
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.28-cleartext-passwords.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.2.28-cleartext-passwords.patch
 
 	# CVE-2006-5779, bug #154349
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.3.27-CVE-2006-5779.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.3.27-CVE-2006-5779.patch
 
 	# reconf for RPATH solve
 	cd "${S}"
 	libtoolize --copy --force --automake
 	eaclocal || die "aclocal failed"
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-2.1.30-rpath.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-rpath.patch
 	eautoconf || die "autoconf failed"
 }
 
diff --git a/net-nds/openldap/openldap-2.3.30-r2.ebuild b/net-nds/openldap/openldap-2.3.30-r2.ebuild
index d378012a45d7..245ec4ef206d 100644
--- a/net-nds/openldap/openldap-2.3.30-r2.ebuild
+++ b/net-nds/openldap/openldap-2.3.30-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.30-r2.ebuild,v 1.12 2007/01/16 23:22:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.30-r2.ebuild,v 1.13 2007/01/16 23:59:56 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -181,7 +181,7 @@ src_unpack() {
 		${S}/servers/slapd/Makefile.in
 
 	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
 
 	# ensure correct SLAPI path by default
 	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
diff --git a/net-nds/openldap/openldap-2.3.32.ebuild b/net-nds/openldap/openldap-2.3.32.ebuild
index e7eef2c33489..efec319a3f95 100644
--- a/net-nds/openldap/openldap-2.3.32.ebuild
+++ b/net-nds/openldap/openldap-2.3.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.32.ebuild,v 1.1 2007/01/16 23:22:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.32.ebuild,v 1.2 2007/01/16 23:59:56 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -181,7 +181,7 @@ src_unpack() {
 		${S}/servers/slapd/Makefile.in
 
 	# supersedes old fix for bug #31202
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
 
 	# ensure correct SLAPI path by default
 	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \