remove stray patches too

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 10 insertions, 56 deletions

diff --git a/dev-util/coccinelle/ChangeLog b/dev-util/coccinelle/ChangeLog
index 3aa1aff83acd..d25b05882c05 100644
--- a/dev-util/coccinelle/ChangeLog
+++ b/dev-util/coccinelle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/coccinelle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.17 2012/05/05 14:30:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.18 2012/05/05 14:35:08 aballier Exp $
+
+  05 May 2012; Alexis Ballier <aballier@gentoo.org>
+  -files/coccinelle-1.0.0_rc7-pcre.patch,
+  -files/coccinelle-1.0.0_rc7-pcre-linking.patch:
+  remove stray patches too
 
   05 May 2012; Alexis Ballier <aballier@gentoo.org>
   -coccinelle-1.0.0_rc7.ebuild, -coccinelle-1.0.0_rc10.ebuild:
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 84589702b2e1..246cbe7b2fcd 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -3,16 +3,14 @@ Hash: SHA1
 
 AUX 50coccinelle-gentoo.el 154 RMD160 7e2d1bd4e9811a1bb6768511f1bf150e0c8e4dd6 SHA1 08220402a063f2d983d55a5fb949bc92d9f669a9 SHA256 66dba99a78fd02b8b232b14b11d6f2b2595dd5bfa867d5bb16be117999fbb4cc
 AUX coccinelle-1.0.0_rc7-parallel-make.patch 192 RMD160 54c44bc377ee6aab1906424b94969db2f7defcb3 SHA1 3284b714e134cb3a749f4b5db5cbcf19aca471e8 SHA256 a497f4f24985a609e9f9845192b912253d8351e63703707eed7700c18e1ec8ed
-AUX coccinelle-1.0.0_rc7-pcre-linking.patch 736 RMD160 d159a9e2135c1642d5d197eee283ae6e05cf0eb9 SHA1 e12323cc52971c020bbc18fbc7039860435d0c0f SHA256 a56f00fd839a289800280ab5c6b8b8ddf056b2662a667307a09b33349ba86c2f
-AUX coccinelle-1.0.0_rc7-pcre.patch 1127 RMD160 e1020264de12f81f20490e2930828b19b18d0887 SHA1 78e961458cf4e5bbae6e09fa11fababa02eee5dd SHA256 432bedf758407089ebc9fd453b2dc197c9de3602671ae5dddd2d57cdef680e51
 DIST coccinelle-1.0.0-rc11.tgz 2356524 RMD160 eac8bf5e92dd5b204736ffa65a211f03c8e892e5 SHA1 a48dfb9ad10769da9676c9d38704397a0866ff42 SHA256 275d0beee5a165ed6edfd4da70b98f9f802e6de5d59ebc075041ff8c126d03df
 EBUILD coccinelle-1.0.0_rc11.ebuild 3077 RMD160 a5c688232cc4a4c4a94dbe3458f9481c111a491c SHA1 2ceb3f1d26f5ffad344ec0ddb7346fa7dfb6e9ff SHA256 d73ebaf630c3caf187a02276e66a50ffef91971c0ab6c04ee348095d5a656478
-MISC ChangeLog 3042 RMD160 8c4e1dc724d0024358d5b995d795b57c6c61a1b3 SHA1 c4b4c325d19423597d4eb8d83bd2a3b9f3c8b827 SHA256 26edf50082a14f82478226acccf2e035ebeea3333989c4012d9a1ab366b2c5c2
+MISC ChangeLog 3213 RMD160 7bf42aee1b63b0dfdec759ef07e7c023c2ba37a0 SHA1 d3f1eec711e658bda0f64ee8a4f2669359a2a077 SHA256 61f66f8031d027826c76958f8ff741c4e64f37c5a75907dcd896b0cd2cd5ca3c
 MISC metadata.xml 246 RMD160 531769961b9ea944006889544d9ba6dae6901d26 SHA1 e5839f081334ce6d81a6608b3996b73315b8800c SHA256 7c41a7e52e792cf6b02e544290706ab0266df8c36214b503083c4daa89a636fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+lOX8ACgkQvFcC4BYPU0q/gQCcDY00zFclAPJT/olUhq3vcMrv
-8ggAniz2tockwblAASu/Dqh3SfxyEAIm
-=V9bi
+iEYEARECAAYFAk+lOqIACgkQvFcC4BYPU0qSLgCfR1HknnC8Tffi5M5nafg2hy9H
+sAIAniQoM0H0qbWwXZqbgLhpWwY+TAq7
+=fr/O
 -----END PGP SIGNATURE-----
diff --git a/dev-util/coccinelle/files/coccinelle-1.0.0_rc7-pcre-linking.patch b/dev-util/coccinelle/files/coccinelle-1.0.0_rc7-pcre-linking.patch
deleted file mode 100644
index 271dcf9ceedc..000000000000
--- a/dev-util/coccinelle/files/coccinelle-1.0.0_rc7-pcre-linking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- coccinelle-1.0.0-rc7/Makefile.orig
-+++ coccinelle-1.0.0-rc7/Makefile
-@@ -225,13 +225,13 @@
- $(OPTOBJS):$(LIBS:.cma=.cmxa)
- 
- $(EXEC): $(LIBS) $(OBJS)
--	$(OCAMLC) $(BYTECODE_STATIC) -o $@ $(SYSLIBS) $(SEXPLIB) $^
-+	$(OCAMLC) $(BYTECODE_STATIC) -o $@ $(SYSLIBS) $(SEXPLIB) $^ $(PCRELIB)
- 
- $(EXEC).opt: $(LIBS:.cma=.cmxa) $(OPTOBJS)
--	$(OCAMLOPT) $(STATIC) -o $@ $(SYSLIBS:.cma=.cmxa) $(OPTSEXPLIB) $(OPTLIBFLAGS)  $^
-+	$(OCAMLOPT) $(STATIC) -o $@ $(SYSLIBS:.cma=.cmxa) $(OPTSEXPLIB) $(OPTLIBFLAGS) $^ $(PCRELIB:.cma=.cmxa)
- 
- $(EXEC).top: $(LIBS) $(OBJS)
--	$(OCAMLMKTOP) -custom -o $@ $(SYSLIBS) $(SEXPLIB) $^
-+	$(OCAMLMKTOP) -custom -o $@ $(SYSLIBS) $(SEXPLIB) $^ $(PCRELIB)
- 
- clean::
- 	rm -f $(TARGET) $(TARGET).opt $(TARGET).top
diff --git a/dev-util/coccinelle/files/coccinelle-1.0.0_rc7-pcre.patch b/dev-util/coccinelle/files/coccinelle-1.0.0_rc7-pcre.patch
deleted file mode 100644
index d9b5c9e3f427..000000000000
--- a/dev-util/coccinelle/files/coccinelle-1.0.0_rc7-pcre.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://www.mail-archive.com/cocci@diku.dk/msg01695.html
-
-diff --git a/parsing_cocci/function_prototypes.ml b/parsing_cocci/function_prototypes.ml
-index 2f2225a..257e0ca 100644
---- a/parsing_cocci/function_prototypes.ml
-+++ b/parsing_cocci/function_prototypes.ml
-@@ -153,18 +153,19 @@ and strip =
-      ref [],-1) in
- 
-   (* need a case for everything that has an unvisited component and can be in
--     a function prototype *)
-+     a function prototype.  Also get rid of constraints because pcre
-+     constraints cannot be compared. *)
- 
-   let ident r k e =
-     donothing r k
-       (Ast0.rewrap e
- 	 (match Ast0.unwrap e with
- 	   Ast0.MetaId(nm,constraints,seed,pure) ->
--	     Ast0.MetaId(nm,constraints,seed,Ast0.Pure)
-+	     Ast0.MetaId(nm,Ast.IdNoConstraint,seed,Ast0.Pure)
- 	 | Ast0.MetaFunc(nm,constraints,pure) ->
--	     Ast0.MetaFunc(nm,constraints,Ast0.Pure)
-+	     Ast0.MetaFunc(nm,Ast.IdNoConstraint,Ast0.Pure)
- 	 | Ast0.MetaLocalFunc(nm,constraints,pure) ->
--	     Ast0.MetaLocalFunc(nm,constraints,Ast0.Pure)
-+	     Ast0.MetaLocalFunc(nm,Ast.IdNoConstraint,Ast0.Pure)
- 	 | e -> e)) in
- 
-   let typeC r k e =