Merge stable keywords; Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 17 insertions, 49 deletions

diff --git a/dev-tex/html2latex/ChangeLog b/dev-tex/html2latex/ChangeLog
index d92f0ab40466..360e73f529bf 100644
--- a/dev-tex/html2latex/ChangeLog
+++ b/dev-tex/html2latex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/html2latex
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/html2latex/ChangeLog,v 1.17 2013/08/29 16:17:37 idella4 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/html2latex/ChangeLog,v 1.18 2014/07/27 13:05:11 zlogene Exp $
+
+  27 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> -html2latex-1.1.ebuild,
+  html2latex-1.1-r1.ebuild:
+  Merge stable keywords; Drop old.
 
 *html2latex-1.1-r1 (29 Aug 2013)
 
diff --git a/dev-tex/html2latex/Manifest b/dev-tex/html2latex/Manifest
index 498884634885..a9a6cb7c3085 100644
--- a/dev-tex/html2latex/Manifest
+++ b/dev-tex/html2latex/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 DIST html2latex-1.1.tar.gz 48439 SHA256 b724f01c9a094ac07740676ae2b1e158a6e94358fc695f1233233efeaae9baf4 SHA512 ceddb3b33359e07fdbfe0263a1ffd7dddfc95cfb256468a921513ed41777b14d4433117b9143cf23d46c867514be66235acd62065591a403c19c6f8f768be73a WHIRLPOOL c9c1daba9612b6f979aed512e97468fa786b72bd6276659f567877528ba2ab346e886048aa98417f663e64c55f819359feb2b38c93afca0edc26c9ba557c6056
-EBUILD html2latex-1.1-r1.ebuild 950 SHA256 e077a02751249fda58c722a142ad77b950abf5a93629a261545e30a1e36124b2 SHA512 c975636ba4742fc6c365d1b88581271ebc047f0da3b017a27792cf954adaf89cede6e08f6348fa82b26984ab2b8c3a7192a260b771b03a86e665891709a2532c WHIRLPOOL 62903c458384471387d1fef35d493b3d020cfff62336dd7571382ee0e70199e62293456b41766106390683b370fb47d36be450da431287f994210fc3caab8cfa
-EBUILD html2latex-1.1.ebuild 857 SHA256 07449686d8c8a6f2db7567211744c99432a7f6a339cc02f5facf8159106fda23 SHA512 7769ac01085d56f2973247234db32768835d872457dc5c7321907fac359ca39d59d7b1b09b420caa9119018ba5af12241c3df152f45a19d79b1161a3f263bd96 WHIRLPOOL 6990df28341dadf13e45092065c0276183163b7ee137e5eb3020063ae700d461a996c224a8583fa1cf697ef3cb8007e5b867dbe4dea96a648c3918ac5fb61059
-MISC ChangeLog 2179 SHA256 2a66b43aadb3f9d4f434998ff6c3a5c1dcdcc4b6e40a5c3b8b9d7e5b94ff8c41 SHA512 ca5ec54b56b2a8008f447bf1744186472bdaa0d93ec4a06f944cf45924bbdcc81753f00fb576fd789d1b0fe7a64182fd1600328422ee540da3a5e393f4d87251 WHIRLPOOL 73aebcf21ea9d9d4cf62de6df9747a18a9366625aa06120fc4ed455d775687777a2d996b607548b4dc71172518f9d332242aec9fe3153d7bde1cd70a3e74d1c0
+EBUILD html2latex-1.1-r1.ebuild 942 SHA256 75c4ba1b6b0a200214d3820a4e6975dc00f2c1f15d14b6a47fe0a399b9e09703 SHA512 e141113e5e9996539deac99c0b7a257cc91c4fd87b6959eee62e4d47676af5b7f9188bfeea323e6ad876291c1272f153bc5f8f82f24c8082fc12f6874d8cbe6c WHIRLPOOL d08d5d1ae4b40f71f535a7e4542208e0be67909679ac95f38cd56a76b2d33ab167a6f13b2bfd7d3db0198f3e33b828ef1aa82c7ae6005247c8571091ddf9d9af
+MISC ChangeLog 2317 SHA256 2a5f9bc91b8618c0da42d6c32dd574a02554fd938725dd03f8932f876ba25033 SHA512 c935435c17e040e61d830dfc20fd08d61836715ea685d222e13c6fa9084eccfcd690056f628dfc4a0e2b0456f11378c84042a97220b9f6069346195b77148512 WHIRLPOOL 35f39c67fd149e727c69d81d2c06ba50dfa2b0e1694ec8613865dab96e4e5c1d1afd34c47742f4fb23502892c793b542dc8bd20f7987508fb0db1edacd4e800a
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlIfdCYACgkQso7CE7gHKw0zVwCfXZOENmHjXfF6tg5sX8PTJ5cg
-SeMAniM+VHaFt0a5evb6EZ7WMB63IUuG
-=5r57
+iJwEAQEIAAYFAlPU+kIACgkQG9wOWsQutdZuDQQAnvqSS1q+JxL/NbXMLn9l+Umz
+N5nrRNMoti9Aii2CAujMuEH4tX9hyadWaP5rM81vZE1TKAS2xjhFbNVjY9PTnGft
+uNraOtk6XEoyBMa6FcpasN04QxKOmuD6VokMzT8suERV+xRGhvt09k4e9LcZWfEn
+4u6uNSxYW3YJyXPUxGk=
+=9Iz5
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/html2latex/html2latex-1.1-r1.ebuild b/dev-tex/html2latex/html2latex-1.1-r1.ebuild
index edd5fd8df23b..efcf8ae5ca2f 100644
--- a/dev-tex/html2latex/html2latex-1.1-r1.ebuild
+++ b/dev-tex/html2latex/html2latex-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/html2latex/html2latex-1.1-r1.ebuild,v 1.1 2013/08/29 16:17:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/html2latex/html2latex-1.1-r1.ebuild,v 1.2 2014/07/27 13:05:11 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/html2latex/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="imagemagick libwww"
 
diff --git a/dev-tex/html2latex/html2latex-1.1.ebuild b/dev-tex/html2latex/html2latex-1.1.ebuild
deleted file mode 100644
index dae7133da481..000000000000
--- a/dev-tex/html2latex/html2latex-1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/html2latex/html2latex-1.1.ebuild,v 1.15 2009/09/06 20:47:06 ranger Exp $
-
-inherit perl-app
-
-DESCRIPTION="Perl script to convert HTML files into formatted LaTeX"
-HOMEPAGE="http://html2latex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/html2latex/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-IUSE="imagemagick libwww"
-
-DEPEND="dev-perl/HTML-Tree
-	dev-perl/XML-Simple
-	imagemagick? ( media-gfx/imagemagick )
-	libwww? ( dev-perl/libwww-perl )"
-
-src_compile() {
-	# HTML::LaTex
-	cd HTML
-	perl-module_src_prep
-	perl-module_src_compile
-}
-
-src_install() {
-	dobin html2latex
-	doman html2latex.1
-	dodoc README TODO
-
-	# HTML::LaTex
-	cd HTML
-	perl-module_src_install
-}