Drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 9 insertions, 121 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 9bb4086694f2..5aab621052a1 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.192 2015/01/11 12:24:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.193 2015/01/14 10:31:13 pacho Exp $
+
+  14 Jan 2015; Pacho Ramos <pacho@gentoo.org> -meld-1.8.5.ebuild,
+  -meld-3.12.1.ebuild:
+  Drop old
 
 *meld-3.12.3 (11 Jan 2015)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 86a5ac3c4b79..589b8b4a5205 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST meld-1.8.5.tar.xz 444872 SHA256 e0f1d6007117a4be95d7c399359cb2ebfa80f2b9158222d727e9a35ae4d5d44d SHA512 09b36923fedfb8f67dd120a71a1fb591efd812b8e1e451281ffee639ce02a7c8fd0d280254c5270ec547df38a30c53a309a7749fa2a63093bd3cf8f46195332b WHIRLPOOL 3ae3bafcc99a57e794d7b3d4e794d31b70257cc20800093932d8f5e9ceca3aee9bbe49a80382ef6b206bac23f20e153904c2a074a66fc69fc803354f44bdc858
-DIST meld-3.12.1.tar.xz 461632 SHA256 8e09284f8d50347386a428e1a2222f2b3a704bf84b3736908082968b5b0dc7f8 SHA512 84c4cf6665de2a811da2145c544602cbbfdbe17a2084528814c9c5e95b09e055a2e2c471ed9518204d51afb5e3c3ff81af2e33d6102b53f7eb056487cdf64def WHIRLPOOL a91710de5f590dbe7017fbf756ec9fe40e2db2b94d70da032689548865570882f8339cc43e465f6f920a3c6b807c5a5a64d1de5ce6d0197873ca011eb4b2ba2d
 DIST meld-3.12.2.tar.xz 461932 SHA256 0938e6e6b4de59dbf66947f67c8c5c3d3c834feb8dabae3a047154af9544a101 SHA512 90158658fb620d3471aec8d093ef11d9bba60bd3bf14023c8ae5d685ac61aba41ca9beff9fff02c4b5e256d446752bdf27e3a23b56146c74ae4a24776c30c759 WHIRLPOOL 6bb2bf575d483f7d07d462fa675b085947d7e0717efdd606d6a43bd4dc7c5db9cdb6fb1fee0cf08b3ee94a8a840f3ecb5ccf23d0b630d729a1133959a073bf68
 DIST meld-3.12.3.tar.xz 462856 SHA256 db3572c5c6905b09f4fc28415a7f6f223014391492dd2165ed1bc8512ac4e6fd SHA512 ea462ece2dcc1a6843ac6ce557aa0ed09c320078b1945d40f2436bbd9f953bf2d826043fc5ee18e4840210cb1da8dd6031f2922109f457400b292d044fd3d27e WHIRLPOOL e1a84aafc16b0cdf4f64f524abd4972b32a37504b9810252161e03feb27a975f29f6d3926d66a99cd9e005613fdb77dabb7367243a1d3d137585c8829e2ec28e
-EBUILD meld-1.8.5.ebuild 1839 SHA256 0d32d790f5b87cea4409b262339441c443afeb9a79eaa9040b359862cf77aeb9 SHA512 85d6fb5266174888b8dbcf4f8e17678bcd4bfeb65410538577ce9a3b7a526c55efad5227da4b9e232a28c52f7487c94ff8867e9ae6c4e0717bc45689a9fb4ba6 WHIRLPOOL d8b283ad0d2d3d54d96c6503ba1dc8ff0bd336ba974b1b849f463bacd08eef942628e83cb1044f3d6be5538278f2d76b4ed6cedba93aac563b2054af7c1e1fd2
-EBUILD meld-3.12.1.ebuild 1011 SHA256 0ab20001934a0f74cb87d20dce496d3d882c1e5ff58d3ef494d4cd6ca0d6c971 SHA512 7f11406df269e418faa118b4374a953a896a61895512dddc225608994c3f185b5bf709e035b4cca85b80cea00c12837b369f293fb2849244507f20562a5e4407 WHIRLPOOL 33238367964f3844e10af31a4f1d69137010805dab005b5683004f8f4b0836ebf28765096ab6e51f96fe160a564b15b1b283e1122d13b19330e4759faeec21b7
 EBUILD meld-3.12.2.ebuild 1011 SHA256 803ef88e46be01eddd9f69fe26b23e94dc48e3fe672209a1a86929ac69156c02 SHA512 5270fddcb36926833ba2abf3344e99d4204500c7ee2f7c42ee091fdd277c2f0db94161c33c0bf747019585f8f60e2945531c5631e5cb737bff2d9055c48a4937 WHIRLPOOL aa64e052a137f7c2b4b2db9ca23c5c6d5218e47de5bcc7f74c88543d743f15b525db739df7f3041cfc0b3b1307f7175a409895b0df9250b84c5fe560906a4473
 EBUILD meld-3.12.3.ebuild 1011 SHA256 a9588edf59c80f79252c8433aaa1d613c6c5368a4db81393ee436ca6a12bb946 SHA512 05ceb5e7d0b328c6f00c71927ae91d742f2bc406dea74b9caee0db02d830285fc88924b6adcd9c43779a49449da4adda462115032f449bef90723c6d3c37329e WHIRLPOOL d490d128443550106301ae8cdc20f29d31a36931e3e4b09b7b22fc00c01f360eba2b4e46e7e0e97e76e2178c1aeb757088be9d84d353b82b6e2a1caaacacdde2
-MISC ChangeLog 24588 SHA256 1723ca89526f942f72eefcd6ae59e81c23854911e0821efdf4bc473d17bdff39 SHA512 5fad554912c342eed4c997d3804b629de8c718fa465b68351c72658874d5e5a1ca2465244b577072180d6b6659f920b8faa22433a6d9d81fd8b9dfcd56b2e42e WHIRLPOOL 2f7a05e5017706d6e7080aec3c9b8ff777c5dba0084e269ff8a273b12f0928a7bd7adab382c2fe6ab377b88f6e1a58e727ff119f73b45924738f8b94c733af21
+MISC ChangeLog 24691 SHA256 d6d7e7e111fb70ead6cef223cda8abbd4c0d9e3b0ddaa9113133019a55c8fd77 SHA512 30ebd73e7124f511044794430e2f8bb1717660b3c05961aae358621ec196aecfcfef73d84cd5b3f1021f39be199ba7316d7b2b7e0a53db9941d60f499aa84590 WHIRLPOOL 41841ecbf8386a25d51538867681dfc7573c6dcbb4e4e95c169b08aee3e9b4decdba8bb3f813de4936d9d9ddd308b11f76ce64d2a358474609c3ebd3baf6378b
 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSya44ACgkQ1fmVwcYIWAZmmgCeISt83saT+Dj0YY/dxfIdNyBD
-jjwAoM0kRYjZPO+t1QvTb+0CGrjVNEYi
-=HJ7t
+iEYEAREIAAYFAlS2RXQACgkQCaWpQKGI+9QeEgCfZUM8HPkJ8fZbsDEQfbrVaMk6
+wpcAn2/jzRff5rSOtz51vrjJ28yQVGHm
+=XWyN
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.8.5.ebuild b/dev-util/meld/meld-1.8.5.ebuild
deleted file mode 100644
index 4793f3d83195..000000000000
--- a/dev-util/meld/meld-1.8.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.5.ebuild,v 1.3 2014/07/23 15:16:02 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit eutils python-single-r1 gnome2
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+highlight gnome"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] )
-	gnome? ( >=dev-python/gconf-python-2.22:2[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/gtk-doc-am
-	dev-util/intltool
-"
-
-src_prepare() {
-	# fix the prefix so its not in */local/*
-	sed -e "s:/usr/local:${EPREFIX}/usr:" \
-		-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \
-		-i INSTALL || die "sed 1 failed"
-
-	# don't install anything to /usr/share/doc/meld
-	sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \
-		-i INSTALL || die "sed 2 failed"
-
-	# don't run scrollkeeper (with the wrong path),
-	# leave that to gnome2.eclass #145833
-	sed -e '/scrollkeeper-update/s/\t/&#/' \
-		-i help/*/Makefile || die "sed 4 failed"
-
-	strip-linguas -i "${S}/po"
-	local mylinguas=""
-	for x in ${LINGUAS}; do
-		mylinguas="${mylinguas} ${x}.po"
-	done
-
-	if [ -n "${mylinguas}" ]; then
-		sed -e "s/PO:=.*/PO:=${mylinguas}/" \
-			-i po/Makefile || die "sed 6 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"/usr/bin
-	doman meld.1
-}
diff --git a/dev-util/meld/meld-3.12.1.ebuild b/dev-util/meld/meld-3.12.1.ebuild
deleted file mode 100644
index 216ffc2ce983..000000000000
--- a/dev-util/meld/meld-3.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.1.ebuild,v 1.1 2014/10/25 22:33:47 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.34:2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.6:3[introspection]
-	>=x11-libs/gtksourceview-3.6:3.0[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	dev-util/itstool
-"
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}