Cleanup patches.

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

3 files changed, 6 insertions, 64 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index cb60aecaedac..3c5503766196 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.496 2015/03/08 03:52:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.497 2015/03/08 03:59:54 robbat2 Exp $
+
+  08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org>
+  -files/openldap-2.4.17-contrib-smbk5pwd.patch:
+  Cleanup patches.
 
   08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org>
   -files/openldap-2.4.19-contrib-smbk5pwd.patch:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index d95749770b76..b8bd5a6e9a06 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -9,7 +9,6 @@ AUX openldap-2.3.43-fix-hang.patch 645 SHA256 48d1f63a303142e535413b3a42e1fdfea8
 AUX openldap-2.3.XY-gcc44.patch 1169 SHA256 c799ad2adde0e0801bfd641c1a43860180121a04897b8e2a01ad000ea31e2a8d SHA512 9e7b726b384390dbf85c50cd344b6a614d09823293f1af2642cfb50c25f4f39254ae0b19cd0da0b30e6fbd270f61646487e1643406438bd2ec6b37883b03f9f2 WHIRLPOOL c5881dac9b095c28f3dd75fd71dfada84705bd42d643172389854f0c65e548a0f8721abef50568f63ebd85ac7bfeff68c64703dfdec0f7b42a57b92cf2f95097
 AUX openldap-2.4.11-libldap_r.patch 515 SHA256 3310a89d38bc39e6eb4333799d475411b274482b8bccab212b3edfd4385db70e SHA512 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 WHIRLPOOL f0c115c60a1405bb6d34090d878ba82b454cced4a7718e1132bc8d118032ae656dcd0207640142740ea4f547403edf2b95c97ae2c7f67a2b656b83cb3a508e45
 AUX openldap-2.4.15-ppolicy.patch 418 SHA256 98269fa1e8a1a0e62dad9acd36fd9a33614fca9a5830d6e7e606db8eb7f85de5 SHA512 59db36c9b4d16e7ccf4b318af2a8d0c6e29cda7e567641b3bcc6069bb7d610a8ac8b56e16ca72165b3e50841abb1ef693b9e2958f16997ac637554f3a67b7146 WHIRLPOOL ae52ce30b17e0413ee87db55070d64e06e4ab5e14adf96f808a0cfba39c3f946fc5b4e4431d8fc6123c025261acd6a16e2245a1b46e1eb7a131444e5ffc7825f
-AUX openldap-2.4.17-contrib-smbk5pwd.patch 2046 SHA256 81c146b2ee96ef03c169665f366ac25ebf93e2f1abb8ff41dc8741cb0927b813 SHA512 71d231a5238dd4f6fee04f86fe859ec80a8cf357e8fb9eef8a7240094c0d096b0147d57f4d5c08830c313d65a7a237259a4202e0437cc49e002d62073b68fefb WHIRLPOOL eca3ffb644d63d0f5f903da5ac165a4b286425f8e26f85bd154f91be75c8d39177ae26af2fd670df965e9ab23990f4c4198f4d9c3b334402479cca958dfff85b
 AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 SHA256 31e816eb9f3b52f5f9d183f82adebff75892e45e764187e579a92204c90889cb SHA512 6e4d3d04344433967ae099471e2af9d706e77206fc5e8d84d63681c5b975110f9abbee5d29be0a51e4cf8bc8ee157d8f386d99ffcebd059ef1be660530aaa096 WHIRLPOOL 38d4e60faff9d3a5f21e0783e688b4716d8d04976f549958798becad3e03b06eec2eeeac1b7491fe361e077b4aca5b75506bd45d65668746ab67db3a20d86a28
 AUX openldap-2.4.17-gcc44.patch 509 SHA256 33345882f601050ecaa6bb3dd7458e6b5f8e3684345847f7a53d4a1b0f514bda SHA512 ea2c862c7a7b8bc17c31ece694c010dd648840cb4facd48d5640767d859bf3c9108d547007984cb759f4a8810ff99ab8295c82dc2ad069f568d037d8448e6ff4 WHIRLPOOL 5f597463b6e92b43e0d6beabf426f5d6000fb204dfe8080ebcf57ec71391712fb24f728f6e61d205dd3ef9e78c7eb8a443994c68469f80b2536cfea3cd75eed4
 AUX openldap-2.4.28-contrib-smbk5pwd.patch 1621 SHA256 62937bd82d218cddc8637d194c6aedc316cd1eb6179c00ba70cef0381b4e841b SHA512 0ef2d506fff828f466b2a18453193ddbdf98bbf8e199383708086559215a35e8bb4999216798f249e00acb3b81253a0bb4597c6c4815245c2cc190d2122b5994 WHIRLPOOL da17b5eb387ef35680984d30215d74715bb3dabdc06d9d5673244e7681a769c7268ca7876a65692187b48c3f7a8f3ff16293306834a2ea1cd19edc008bd66426
@@ -49,5 +48,5 @@ EBUILD openldap-2.4.39.ebuild 24012 SHA256 7097370f065bd4e6001be5b1e91aabca01702
 EBUILD openldap-2.4.40-r2.ebuild 26227 SHA256 2fac256a6c93c5098ddf67f18bd9a8cb71a706d0fb8fe7e78aa0dda257550628 SHA512 b2d6f3320749ebd91c8a62834d87dac4f7840d6aae8d3ed698108fc2e7a42f9d83043ef8bc8892031e96208377d763a4010321ce0469a36d76e4338a43f0107d WHIRLPOOL 333ab08c7a2a0345d221156bdf7bfd9ea88bad942b0d66ed21652ac0dbfd628904ec62f5a2f7bd1dcc83f6dee0563d8b69a79db4890966b654cfc74eb9ad704e
 EBUILD openldap-2.4.40-r3.ebuild 26233 SHA256 85868ef21a22a604537f419f8044966d9f30299c58e11411d81152342a791801 SHA512 4420594ab4483046a997e30f1b7cefc1a3ec38dec0183f941af83a6f255b2d55a015e89c90fbc3a4bf46e113d2a94fe34a35db9de6be57d690ab9c0e1256468a WHIRLPOOL 0e5c7fcce630bb4bd5dfc0e774a53de5cdebe4d34fd541f05707786ef3e932aaab9d584f93ba3815cf77ac83c56187a8e8440dfb42b5636ce7c692c4f0a3e5ad
 EBUILD openldap-2.4.40.ebuild 26665 SHA256 de9e846d0c1576dceb0fb8fb26123a4ba7078786a425d2af76ea4b9efedae7f2 SHA512 e52158c029504321199c5dc495c2f88d00d298fc19eda768cb3895d5d1f5e5afdfb8e21cfe55e322ca646c4d5125b8340ae03b7ff7147effe7e4d38a82f29d67 WHIRLPOOL 9a060d2ea77c2ca4587d481b47938a57e30c2027d831ee615f3e1fddc324f59d0b1dfc38b7bba762f8417ddf728f6a79397c4ad74c8d1d4e15feca63dab39232
-MISC ChangeLog 87144 SHA256 0edc701e7701641bdbb7d1fd490ea60f690c013dcc71d92e0246e5cc4b9c5c50 SHA512 5154c60345d936958d049996a3049cc3500a91d12b862818cb59a2fbb75daf4b7b5d9d7261905998f75a86dbb73a8d96a9402eaaac174337678c717e50fbc847 WHIRLPOOL 7b8fdd324ca46a4c2c1eb08a28210ff1ed365d9ace18e5f6dc2e66e0cfd820e622518f597441c77df8216536ee7be46f531945e1cc6c1d2474b3c810ce5d0c3b
+MISC ChangeLog 87266 SHA256 8ac959168952b8e4b51ae80e9c7832e89d159c45d0da0de7cf3ac3b508792b68 SHA512 8f0d1f1f3ff96881ebe05307b4db8e2c1d36b6370c491fea91038f245cb9b4f3bebdcb7f069bd8e717d99ceae3e1aa1c18a9d9562e543193cad1f5f654ceb284 WHIRLPOOL e382b4f74b62cac6ff70f2bb5f2b76bed6fd84d102f1b1dca6e897855d7bcdf92fa6093b92a2672f39e3533bc0359d0c955dee63d0161cba792e0fbb72df5403
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch
deleted file mode 100644
index bf59170adef4..000000000000
--- a/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nuar --exclude 'openldap-2.4*' --exclude p -I '$OpenLDAP' openldap-2.4.17.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.17/contrib/slapd-modules/smbk5pwd/Makefile
---- openldap-2.4.17.orig/contrib/slapd-modules/smbk5pwd/Makefile	2009-04-27 16:36:57.000000000 -0700
-+++ openldap-2.4.17/contrib/slapd-modules/smbk5pwd/Makefile	2009-07-27 15:00:37.097428029 -0700
-@@ -9,37 +9,43 @@
- # top-level directory of the distribution or, alternatively, at
- # <http://www.OpenLDAP.org/license.html>.
- 
-+#libexecdir=/usr/lib/openldap
-+moduledir=$(libexecdir)
- LIBTOOL=../../../libtool
--OPT=-g -O2
-+#OPT=
- CC=gcc
- 
- # Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
--DEFS=-DDO_KRB5 -DDO_SAMBA
-+#DEFS=
- 
--HEIMDAL_INC=-I/usr/heimdal/include
-+#KRB5_INC=
- SSL_INC=
- LDAP_INC=-I../../../include -I../../../servers/slapd
--INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
-+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC)
- 
--HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
-+KRB5_LIB=-lkrb5 -lkadm5srv
- SSL_LIB=-lcrypto
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
--
-+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber
-+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS)))
-+	LIBS=$(LDAP_LIB) $(SSL_LIB)
-+else
-+	LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB)
-+endif
-+	
- all:	smbk5pwd.la
- 
- 
- smbk5pwd.lo:	smbk5pwd.c
--	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
- 
- smbk5pwd.la:	smbk5pwd.lo
--	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
--	-rpath $(PREFIX)/lib -module -o $@ $? $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
-+	-rpath $(moduledir) -module -o $@ $? $(LIBS)
- 
- clean:
- 	rm -f smbk5pwd.lo smbk5pwd.la
- 
- install: smbk5pwd.la
--	mkdir -p $(PREFIX)/lib/openldap
--	$(LIBTOOL) --mode=install cp smbk5pwd.la $(PREFIX)/lib/openldap
--	$(LIBTOOL) --finish $(PREFIX)/lib
-+	mkdir -p $(DESTDIR)$(moduledir)
-+	$(LIBTOOL) --mode=install cp smbk5pwd.la $(DESTDIR)$(moduledir)
-+	$(LIBTOOL) --finish $(DESTDIR)$(libexecdir)