remove old

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 11 insertions, 89 deletions

diff --git a/dev-ml/tyxml/ChangeLog b/dev-ml/tyxml/ChangeLog
index bdb54a1c0ca3..769cd14a58a4 100644
--- a/dev-ml/tyxml/ChangeLog
+++ b/dev-ml/tyxml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/tyxml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/tyxml/ChangeLog,v 1.11 2014/03/13 20:23:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/tyxml/ChangeLog,v 1.12 2014/11/27 09:30:32 aballier Exp $
+
+  27 Nov 2014; Alexis Ballier <aballier@gentoo.org> -tyxml-2.2.0.ebuild,
+  -files/pcre.patch:
+  remove old
 
 *tyxml-3.0.0 (13 Mar 2014)
 
diff --git a/dev-ml/tyxml/Manifest b/dev-ml/tyxml/Manifest
index d6e431a87e26..cd18dcce4723 100644
--- a/dev-ml/tyxml/Manifest
+++ b/dev-ml/tyxml/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pcre.patch 957 SHA256 483c7d71267f5a36ac4c291829b4abc61674fc8df03a3e7d062683ff7c7ff07d SHA512 04f6f6164d27e919873541951f38efffb10a96dbd12ef988b9b254cde90ca4676cb6624ab3601d3e0908c10434f414a761e8ef16b8cecb7fcba6982a54cd4db8 WHIRLPOOL aaded1056852afb102e91a355d75878bd0f32315537db713554b9fb217a31885562d99868b7effef86a265d5bd3f010ac152f8ab6d32418c0ccd3335ee7b2aa6
-DIST tyxml-2.2.0.tar.gz 105748 SHA256 8eab54f5fd7e9f5df3ac894123bd5abb124d741411a0ad5333e5058e44325f84 SHA512 933ba2e4ed1f6ead2e2f0a6e77a818b6bf479d7994cb5ee23f9f2d4e44bb0ee9c13c57e512686a02fc8220d885065184c30745ca9608a64e8e62a1b9b0198106 WHIRLPOOL 553f683e7c06aa7fa3e175408a8f62d6341093c44967def019101bfae42bf6c5dcd215aa85470de7ed07e861fb69e9cd83cc8b9e53a6d59c99b6ff93bc18c4ef
 DIST tyxml-3.0.0.tar.gz 148354 SHA256 43f5133b52fb99ca4f0887c82717633ad2893b954c0c3084238f82479eaf6b33 SHA512 18c6ad85f26a689f65cf1f2c4417bd67a34400a7c800f0ab3c50575244fc6666eea248ad6a1093baf0b293b74b3e90632bf678916e5875b8a5fb4356c6fb1a8b WHIRLPOOL 4b92710dcbb38db5395959cf373621055c82b0aba2ab01eb6ccfa781d248691d68e82686705047ef8ba86568c75558641596217bd077b1ee310ef77a7985892a
-EBUILD tyxml-2.2.0.ebuild 1086 SHA256 dcaeb0cd559ca19ede0b2ff812bdefe1202fc39f2f6f04e9d553f7318455e36f SHA512 aa02fbca745753f4196a7fd5f1e27e08981ffd2f10bfa94a6f745116a05cb69caa89f7feacb9f86b6f19a6baae464851e75dbff1d369339dd1916eb6c7bb11a9 WHIRLPOOL 63b539bcfcc9e033b2a6868311af054eee18d9a901309c215d2f2bd0d0d084970e6276af6811aa8916ed409a6fb98f3ef2446c26283b951e72bab4555ab06207
 EBUILD tyxml-3.0.0.ebuild 556 SHA256 abd8e84b29a58fd1e351a04976a8130128300a31a8ee041d6bfca0fbff1bceed SHA512 a39fc8447d28b3132380e42fb5f17b0fecbc45cad2b679155481120e99e90c6bedd48175fdae8c1bcda0df66c5e1b4d6fb3b01c64e174a651d75b6e747dbabf3 WHIRLPOOL eca94225d9d370ae656b66ec05c9483c5ec87156546713de0fbbaef2153d2cbd706bf54afa8b24adb3b8645b10c85f7bd483f02365377edd5ad5e80c72044c01
-MISC ChangeLog 1585 SHA256 ac22248b292675bede894ea73b9b22c337a1b4e7a18e98ab5e876dc9013cfed8 SHA512 2389cc6e396414171292c8e3857f74df024fc3251a20547da7fc1e0e19d2f3341696caddc820438f5c9887eeb2f3a54e78479e8b3ee1bb3960f12e22d1a4b3b0 WHIRLPOOL 4cca40dc497dd6173caf7da350d96f26a95c984aa920e67cf981b8d7d888408adff02dc28c30bd9a9ca35648ff8e4a55cd4215b9028166444f801e9e835b81a6
-MISC metadata.xml 241 SHA256 addf8ee1daa81fa1610eae3f9c133257c0354a09365f71df318e1b1b8a463e12 SHA512 8fa46c73b1eeded0ba1c6950e9bf1cfadc8b7bea3eb5214d228200ef522bfb8e0dec653805897a1dc2737ff366c8160d042999ee06898fc4b8d790179c7a8906 WHIRLPOOL a7f4f1067f2fdecea260a18a9b69375d0236ba230c61278f01dd99dc76e9febffe910ea676773335e0dda672f5ef2e6ef8a3927d0e04c413eef5576479e6cde9
+MISC ChangeLog 1693 SHA256 6bf0de351ab4d7cc6edefeab914a7073e4decc28c69c01427f409c9d142186c8 SHA512 48d7e574710cbbc360503b5146c5c559f0aac82539829bdd16aff4728abe5533abeb56802fd2f8e1df689ec14f3c9000abc64ab1f04b0c9a6cb252aa5625521a WHIRLPOOL 706c3a6cf1cfd1731bb06bbc2dfd3c3c07fe9c677366ccddc63162dd1b32d302ddcb9f3e20da9d03718c80d0e43a27846a94a71fa2aad522aebbef6972003f86
+MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMiE7QACgkQvFcC4BYPU0q7YQCbBfxyE3d5jlAZh3+OefPK44Z1
-0BAAoI9KetRQHHsQnJB2xv9ingkAYHSq
-=2i54
+iEYEAREIAAYFAlR27zkACgkQvFcC4BYPU0rJhACfXmkJazQXRZaYU0/GV1JkNYjQ
+S2wAn0qAb1kfrgSHCCVePDr9QbEGIWjW
+=0XN5
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/tyxml/files/pcre.patch b/dev-ml/tyxml/files/pcre.patch
deleted file mode 100644
index 06383c3f4efc..000000000000
--- a/dev-ml/tyxml/files/pcre.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix build with ocamlnet built without -compat-pcre.
-https://bugs.gentoo.org/show_bug.cgi?id=473746
-
-Index: tyxml-2.2.0/files/META.in
-===================================================================
---- tyxml-2.2.0.orig/files/META.in
-+++ tyxml-2.2.0/files/META.in
-@@ -2,7 +2,7 @@ _LIBDIR_
- 
- description = "XHTML and HTML5 pages typed with polymorphic variants"
- version = "dev"
--requires = "netstring"
-+requires = "netstring netstring-pcre"
- archive(byte) = "_LIBNAME_.cma"
- archive(native) = "_LIBNAME_.cmxa"
- 
-Index: tyxml-2.2.0/lib/Makefile
-===================================================================
---- tyxml-2.2.0.orig/lib/Makefile
-+++ tyxml-2.2.0/lib/Makefile
-@@ -13,7 +13,7 @@ DUCE_INTF  := xml_sigs_duce.mli xhtml_ty
- 
- DUCE_FILES := xml_print_duce.ml xhtml_duce.ml
- 
--LIBS     := -package netstring
-+LIBS     := -package netstring -package netstring-pcre
- 
- # SYNTAX := -ppopt ../syntax/pa_include.cmo -package camlp4 -syntax camlp4o
- 
diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
index ea89b16d367e..2193d772e351 100644
--- a/dev-ml/tyxml/metadata.xml
+++ b/dev-ml/tyxml/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>ml</herd>
-		<use>
-			<flag name='ocamlduce'>Enables ocamlduce XML typechecking.</flag>
-		</use>
 </pkgmetadata>
diff --git a/dev-ml/tyxml/tyxml-2.2.0.ebuild b/dev-ml/tyxml/tyxml-2.2.0.ebuild
deleted file mode 100644
index e4f11a7d55b3..000000000000
--- a/dev-ml/tyxml/tyxml-2.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/tyxml/tyxml-2.2.0.ebuild,v 1.3 2013/07/23 17:47:39 aballier Exp $
-
-EAPI=5
-
-inherit eutils findlib
-
-DESCRIPTION="A libary to build xml trees typechecked by OCaml"
-HOMEPAGE="http://ocsigen.org/tyxml/"
-SRC_URI="http://www.ocsigen.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc ocamlduce +ocamlopt"
-
-DEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	>=dev-ml/ocamlnet-3.6:=[pcre]
-	ocamlduce? ( dev-ml/ocamlduce:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/pcre.patch"
-	export myopts="OCAMLDUCE=$(usex ocamlduce yes no)"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake "$myopts"
-	else
-		emake "$myopts" byte
-	fi
-	use doc && emake doc "$myopts"
-}
-
-src_install() {
-	findlib_src_preinst
-	if use ocamlopt; then
-		emake DESTIR="${D}" "$myopts" install
-	else
-		emake DESTIR="${D}" "$myopts" install-byte
-	fi
-	dodoc CHANGES README
-	use doc && dohtml -r doc/api-html
-}