Bump to 1.1.4 (from 1.1.3). Remove 1.1.2, 1.0.0. #142318

Package-Manager: portage-2.1.1_pre5-r1

5 files changed, 22 insertions, 148 deletions

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 936b669b83ab..a65f8fecf6e6 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,36 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX meld-1.0.0-frpo.patch 377 RMD160 abb6c33943585bca10ca4d05989dfcc25717bf55 SHA1 f9f7ebf30dc6720cc4048e9d7b1cccabf0347bc7 SHA256 35f4c08a692f5c7c0c9cd5983924ea6466dd0f6eba104eece52a2ae43a9a2a16
 MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377
 RMD160 abb6c33943585bca10ca4d05989dfcc25717bf55 files/meld-1.0.0-frpo.patch 377
 SHA256 35f4c08a692f5c7c0c9cd5983924ea6466dd0f6eba104eece52a2ae43a9a2a16 files/meld-1.0.0-frpo.patch 377
-DIST meld-1.0.0.tar.bz2 304181
-DIST meld-1.1.2.tar.bz2 588213
 DIST meld-1.1.3.tar.bz2 597967 RMD160 43134e32b33aa2f5a405c4ad2ba90eb22b632fbc SHA1 e7f17e8426f29aa448cfed306dccb00ac0a3e43b SHA256 0494636661aadf07520e6d75c986a53af136b6d6c4e71bdcb9dde01554dcbdb9
-EBUILD meld-1.0.0.ebuild 1574 RMD160 38b330437ad576eb380dca44b8dbcd2502922886 SHA1 ae9ff7c4a6793be73b7247d35772a11b318c6502 SHA256 14a2568e31efca9335dcf54b1aa1be6ca5c89d1a64ca57a5a9d00ab338f1422e
-MD5 3648682f5d11b70e80cf429d2593615a meld-1.0.0.ebuild 1574
-RMD160 38b330437ad576eb380dca44b8dbcd2502922886 meld-1.0.0.ebuild 1574
-SHA256 14a2568e31efca9335dcf54b1aa1be6ca5c89d1a64ca57a5a9d00ab338f1422e meld-1.0.0.ebuild 1574
-EBUILD meld-1.1.2.ebuild 1443 RMD160 70ed85e8e1cb801e9693d2d8ffc4561f56b61e4e SHA1 9bc226a79e230b9b7b8b590dea8b5d5bcb6efdc6 SHA256 255e6d640a7484f1f26c67a4ebe3f9d06300e31fa00184834d31798d798a537e
-MD5 edec3470faa5e4d845ea3dc560fe0b6f meld-1.1.2.ebuild 1443
-RMD160 70ed85e8e1cb801e9693d2d8ffc4561f56b61e4e meld-1.1.2.ebuild 1443
-SHA256 255e6d640a7484f1f26c67a4ebe3f9d06300e31fa00184834d31798d798a537e meld-1.1.2.ebuild 1443
+DIST meld-1.1.4.tar.bz2 599912 RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa SHA1 52f51e5825b4e2bb56594a9f4e180908e714848f SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f
 EBUILD meld-1.1.3.ebuild 1404 RMD160 df5ee75ec2934ff6f138340600b6e10cf0b52ade SHA1 1e4c03a193b9985733c88adcb00da83124388b83 SHA256 7ef21ff00ad1ffa0f84db8b7cfbe64d56b2d066a71c3ee1f6086a9dbbad95395
 MD5 7f01d0fa3193d9b79515c42ac0488af0 meld-1.1.3.ebuild 1404
 RMD160 df5ee75ec2934ff6f138340600b6e10cf0b52ade meld-1.1.3.ebuild 1404
 SHA256 7ef21ff00ad1ffa0f84db8b7cfbe64d56b2d066a71c3ee1f6086a9dbbad95395 meld-1.1.3.ebuild 1404
-MISC ChangeLog 5750 RMD160 2174fafd69f8722ea5030db3946bc907729bbf32 SHA1 eb7034846c8932a7cad4df67748bb69ed81ece6c SHA256 23fe8bae3df4f300eb0baf983d807ec06c8fdd70603401f3c7b2fc4108d2d49a
-MD5 b4a6e0f9eab741682cf01c63871fdb27 ChangeLog 5750
-RMD160 2174fafd69f8722ea5030db3946bc907729bbf32 ChangeLog 5750
-SHA256 23fe8bae3df4f300eb0baf983d807ec06c8fdd70603401f3c7b2fc4108d2d49a ChangeLog 5750
+EBUILD meld-1.1.4.ebuild 1408 RMD160 961dbd87fd7c11fc14dcd8b79f831c56983062e6 SHA1 66a37d12eb1c6e40c648efacdfe33f9c58f09574 SHA256 ac61455594ccd61e921649984488d26c877951ac6ab0abc765894f12e6f666f9
+MD5 5f1fab9445292eb3863b2744c925f0fa meld-1.1.4.ebuild 1408
+RMD160 961dbd87fd7c11fc14dcd8b79f831c56983062e6 meld-1.1.4.ebuild 1408
+SHA256 ac61455594ccd61e921649984488d26c877951ac6ab0abc765894f12e6f666f9 meld-1.1.4.ebuild 1408
+MISC ChangeLog 5948 RMD160 06625ca64dd57538879272472871a8ccfe79e8c4 SHA1 d8148816c19014071a420d20369def0d68a4bcf3 SHA256 110131c40ffecdbfc3d7c680a77f564aabfecd3f9e1140a5544481cc5a04802f
+MD5 e98aa8b4b8b9a8d1c28a5baad5ab821c ChangeLog 5948
+RMD160 06625ca64dd57538879272472871a8ccfe79e8c4 ChangeLog 5948
+SHA256 110131c40ffecdbfc3d7c680a77f564aabfecd3f9e1140a5544481cc5a04802f ChangeLog 5948
 MISC metadata.xml 222 RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 SHA1 e78ebe8223fab03acef8562079599d6d962e494e SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
 RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 metadata.xml 222
 SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f metadata.xml 222
-MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63
-RMD160 e06fc9137a22b236360775a48be2dd56edbde9c9 files/digest-meld-1.0.0 63
-SHA256 6d98c0df07aed235d8e85b21a70a1c7294c964231afe133c8d6d33705b9757eb files/digest-meld-1.0.0 63
-MD5 dba9f4dc3e45ac0d468532482b381632 files/digest-meld-1.1.2 63
-RMD160 4b9dbde73f05721f8f56d534ea2a048aa88e964b files/digest-meld-1.1.2 63
-SHA256 732bf8ddab33cf4e55164bd3ea978014cb5067fefcbefe25dd2eb6666e3a5ab3 files/digest-meld-1.1.2 63
 MD5 1d95dee1f5a4b23fa11a334ef1ea4a75 files/digest-meld-1.1.3 235
 RMD160 2cfbdd98b0f1aacc04e05cf05d676a666354f117 files/digest-meld-1.1.3 235
 SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/digest-meld-1.1.3 235
+MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4 235
+RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4 235
+SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFFBZHhJrHF4yAQTrARAtfJAJ9EMXCaVyqQfMyU16AucElsfYPdvQCdEtqE
+ln6tX2oNT/pQe27rvxKY5eY=
+=/tfB
+-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/files/digest-meld-1.0.0 b/dev-util/meld/files/digest-meld-1.0.0
deleted file mode 100644
index 2712553dbca4..000000000000
--- a/dev-util/meld/files/digest-meld-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ccde817f0396d39e9e40f31a3a7611f6 meld-1.0.0.tar.bz2 304181
diff --git a/dev-util/meld/files/digest-meld-1.1.2 b/dev-util/meld/files/digest-meld-1.1.2
deleted file mode 100644
index 77263bea8ae7..000000000000
--- a/dev-util/meld/files/digest-meld-1.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a00473f852c32db0bcd48c84b0f27869 meld-1.1.2.tar.bz2 588213
diff --git a/dev-util/meld/meld-1.0.0.ebuild b/dev-util/meld/meld-1.0.0.ebuild
deleted file mode 100644
index 15f53be4afc4..000000000000
--- a/dev-util/meld/meld-1.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.0.0.ebuild,v 1.8 2006/01/08 21:41:21 compnerd Exp $
-
-inherit python gnome2 eutils
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-python/gnome-python-1.99.15
-	>=dev-python/pygtk-1.99.15
-	>=dev-python/pyorbit-1.99.0
-	dev-python/gnome-python-extras
-	"
-
-#MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if ! built_with_use '<dev-python/pygtk-2.8.0-r2' gnome ; then
-		einfo ""
-		einfo "Meld requires pygtk be built with the gnome use flag set."
-		einfo "Please re-emerge pygtk with the gnome use flag set."
-		einfo ""
-		die "You need to re-emerge pygtk with gnome use flag."
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# Fix the .desktop icon name
-	sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
-
-	# error in fr.po, sent upstream
-	epatch ${FILESDIR}/meld-1.0.0-frpo.patch
-
-	# fix omf scrollkeeper
-	sed -i -e 's:-scrollkeeper-install.*::' ./help/C/GNUmakefile
-
-	# fix the prefix so its not in */local/*
-	sed -i -e 's:/usr/local:/usr:' INSTALL
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/"
-
-pkg_postinst() {
-	python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/meld
-}
diff --git a/dev-util/meld/meld-1.1.2.ebuild b/dev-util/meld/meld-1.1.2.ebuild
deleted file mode 100644
index 9b38f2ee4aa7..000000000000
--- a/dev-util/meld/meld-1.1.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.2.ebuild,v 1.2 2006/01/08 21:41:21 compnerd Exp $
-
-inherit python gnome2 eutils
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-python/gnome-python-1.99.15
-	>=dev-python/pygtk-1.99.15
-	>=dev-python/pyorbit-1.99.0
-	dev-python/gnome-python-extras"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/"
-
-pkg_setup() {
-	if ! built_with_use '<dev-python/pygtk-2.8.0-r2' gnome ; then
-		einfo
-		einfo "Meld requires pygtk to be built with the gnome use flag set."
-		einfo "Please re-emerge pygtk with the gnome use flag set."
-		einfo
-		die "You need to re-emerge pygtk with gnome use flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix the .desktop icon name
-	sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
-
-	# fix omf scrollkeeper
-	gnome2_omf_fix help/*/GNUmakefile
-
-	# fix the prefix so its not in */local/*
-	sed -i -e 's:/usr/local:/usr:' INSTALL
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/meld
-}