Cleanup patches.

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

3 files changed, 6 insertions, 54 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 06ddf87a0c00..252116247ef0 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.498 2015/03/08 04:28:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.499 2015/03/08 04:32:14 robbat2 Exp $
+
+  08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org>
+  -files/openldap-2.4.30-contrib-samba4.patch:
+  Cleanup patches.
 
   08 Mar 2015; Robin H. Johnson <robbat2@gentoo.org>
   -files/openldap-2.4.28-contrib-smbk5pwd.patch:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index bdf02bfa3225..acf4a45e994f 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -13,7 +13,6 @@ AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 SHA256 31e816eb9f3b52
 AUX openldap-2.4.17-gcc44.patch 509 SHA256 33345882f601050ecaa6bb3dd7458e6b5f8e3684345847f7a53d4a1b0f514bda SHA512 ea2c862c7a7b8bc17c31ece694c010dd648840cb4facd48d5640767d859bf3c9108d547007984cb759f4a8810ff99ab8295c82dc2ad069f568d037d8448e6ff4 WHIRLPOOL 5f597463b6e92b43e0d6beabf426f5d6000fb204dfe8080ebcf57ec71391712fb24f728f6e61d205dd3ef9e78c7eb8a443994c68469f80b2536cfea3cd75eed4
 AUX openldap-2.4.28-fix-dash.patch 1101 SHA256 fddaad5f49cce39bf5492bb1dda10f2ce83419c48f128fe536661dde703b5d1b SHA512 f9b3a50eb972f746878afe4a8cda8d7e2a2807932ad2faf602f43e5a1b81166bea4fde764b4e1ae4be0000cc0713ee90a4620afab5809b8460f60ae39a716e9e WHIRLPOOL ba3856cd1008431025811aaa21d0a0ce94896590a16eee8cd27bdc84fd89884b0d27e8dce31bc79e4b4a91884bc90624f1a6afb38efb847839a036b4a2196af5
 AUX openldap-2.4.28-gnutls-gcrypt.patch 340 SHA256 26dc29a502e45f6b1003674c1ef5bc6c79b71d00fc9b2fc7a145291a314370c0 SHA512 53441707e9b24e774c0541ad8b63295eea6dc0352ae2ef3bf389f381da18f1df05fb2f7b41c816e1f697d8f1b208643d05891c03d8fba42d85e3b7689e5ee94f WHIRLPOOL 6be9eda56fd68c9e0818443ca70ee6c1e904aa6126576477d402c9abd2ee44952a0a313efc89f603b02cac35cbfea3c987de5b6ec3625a92bc691386edd85aa5
-AUX openldap-2.4.30-contrib-samba4.patch 1639 SHA256 f47e416d8ef21dcfde6d0ecdace27063e8b20236f5d832675aa4efe222a5a69e SHA512 39a8b2675aa98b4d74a374e3ac45e83e07201ccc807c96eff0aa26e8571503c13fe48fa0d76d610fab99c4615f2ee1388b9bc386abb38a3fa162ca278f872241 WHIRLPOOL 9967fd742c3ee80f5d2dd0c1906b00393bf5e29ba3f7b8d0eef2779004d67292c203eb8ead4e34a993499e8e1aef0e0e5ca78ab64785488bd566be503b0af237
 AUX openldap-2.4.31-gcc47.patch 480 SHA256 6a0bef52a8681e30c4be7c11df88f5c73d2ab90f0bbbb79c550b6174d3978060 SHA512 a35113fe3f5e9ae5b9631976415df41d53a99ae1ca4c4dcdcfd89e6ccc6ba906cf5cfe2ee4901033dba29d62b6607d4a93ca74645eb6ceba38e67c5d8521816a WHIRLPOOL bf1315bebf8b16a625d55ac1d040a1ab831c25c87fe6f9bb9ff4b1b54f621a36e75e6055955e60617823fbf78244cd4aec7f702ea0d7a8d85a164f550d2675e7
 AUX openldap-2.4.33-gnutls.patch 1863 SHA256 e8d493246c2e652135f130c1dedbeb9760bed5f61d73c6662ba7f816ead59e52 SHA512 1b3830cf96b2c470e723dd966330e1b0a69c11aa7b10b5af04f2ab907e7e9ffd038589af7a472a374f47b5d08638b06ad04e0ff9a9180a9b5fc89884d3437df4 WHIRLPOOL 331798cf7ef9270ad57ca81ad1c32c223f8cd3932cec7fb235e3328acabedf68f952ace2903c45277617ebc0f498c919e62eadf638fb5d817717b324635531cd
 AUX openldap-2.4.35-contrib-samba4.patch 1400 SHA256 64ca91d3edae25d392f39a7f538e269b26de4e09923f872014e84ec388bda911 SHA512 332c4b2daa3eba165cfdcd479b1012e139d60095aaa628f8f5750fffb722d39395935bd7d7e56272e98fd234ab0be1c6568a71feeda5d88ba24b91b385defdad WHIRLPOOL c472dc75bbc1261b84ce0bfe8dd0a749200d7540647733ca13c0b1ccd8330739278f83eea3c91b3b29e5982eb6c9f9fb920ffdd9a6faaf4c0e66a97a1d16db55
@@ -47,5 +46,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 87388 SHA256 930dee1c18fa1cad42df3453deef23383e38c8761d0cf2a5e95c7c24eb327acb SHA512 70afa873a560b96d4c32f3fdbe7d17edfa8716f1305bb9b95171d242050862c228753bcacca4353cfda5281b51c3015ce098f5ef1b105048ae2c5b200366a6b3 WHIRLPOOL a2f499b7938b0816a01fac296547fcb43735589c26c7f051aacfca6dfa6f1a4166b3b97a9287501a5c2be60e9638eb08a3ca65d44a29fd3983636d6ffde5deb6
+MISC ChangeLog 87508 SHA256 51eeab2aeeaf805e58dd92f36507308172eeac4b8c569dc55dba1ad8f4b47806 SHA512 85695c5005fc3e4c8e8d8e8cb74bbe16b867cd264409eed7ef11643e40a0b59150e0f834928dd8c13262fcba49f9e88daf01cf36f5a538e7218a53122b3c46d8 WHIRLPOOL 3eddcecb036e57fd2b6041214ec33afc62d108021ef77f32cf4ab9dc2ccd5ac55df82ce82b3e8bd462b2e7af82f4ab4fb8c184ed5da6e2917893816110c85e62
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/files/openldap-2.4.30-contrib-samba4.patch b/net-nds/openldap/files/openldap-2.4.30-contrib-samba4.patch
deleted file mode 100644
index 79a59ec49376..000000000000
--- a/net-nds/openldap/files/openldap-2.4.30-contrib-samba4.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- openldap-2.4.30/contrib/slapd-modules/samba4/Makefile.orig	2012-02-29 21:37:09.000000000 +0400
-+++ openldap-2.4.30/contrib/slapd-modules/samba4/Makefile	2012-05-13 17:01:38.155625715 +0400
-@@ -17,7 +17,7 @@
- LDAP_BUILD=../../..
- 
- LIBTOOL=$(LDAP_BUILD)/libtool
--OPT=-g -O2
-+#OPT=-g -O2
- CC=gcc
- 
- DEFS=-DSLAPD_OVER_RDNVAL=2 -DSLAPD_OVER_PGUID=2 -DSLAPD_OVER_VERNUM=2
-@@ -26,7 +26,7 @@
- 	-I$(LDAP_BUILD)/include
- INCS=$(LDAP_INC)
- 
--LDAP_LIB=-lldap_r -llber
-+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber
- LIBS=$(LDAP_LIB)
- 
- prefix=/usr/local
-@@ -42,24 +42,24 @@
- all:	$(PROGRAMS)
- 
- pguid.lo:	pguid.c
--	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
- 
- pguid.la:	pguid.lo
--	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
- 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
- 
- rdnval.lo:	rdnval.c
--	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
- 
- rdnval.la:	rdnval.lo
--	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
- 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
- 
- vernum.lo:	vernum.c
--	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
- 
- vernum.la:	vernum.lo
--	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
- 	-rpath $(moduledir) -module -o $@ $? $(LIBS)
- 
- clean: