Version bump, drop old

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

4 files changed, 15 insertions, 85 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index faf04191cbe3..dc1468707169 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.170 2013/09/15 21:38:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.171 2013/09/28 20:37:09 pacho Exp $
+
+*meld-1.8.1 (28 Sep 2013)
+
+  28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +meld-1.8.1.ebuild,
+  -meld-1.7.4.ebuild, -meld-1.7.5.ebuild:
+  Version bump, drop old
 
 *meld-1.8.0 (15 Sep 2013)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index dfff0a1548df..3b827bb44f8c 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -2,19 +2,17 @@
 Hash: SHA256
 
 DIST meld-1.7.0.tar.xz 358648 SHA256 d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b SHA512 88441334ff4076d3d6d05f703fe0300b85438d7f010a0b70f621dea6ee2f4b7cf37abefafe292e303472403d4d55daa8275aa170b5a7291fbf3c327378d769ef WHIRLPOOL b87141437a7e4affa25fbbbfa94a7f2799a4fedfbfe3107629b50672ffbf2a5e9a5c88d1738ec9040eb14dd7a294f1f287ff47dc6f5e944f299988ea9a1e745b
-DIST meld-1.7.4.tar.xz 406156 SHA256 17c1230512b4b788c4b7b0c6bbd72b10c1005a810c1c9c8db9a0bf1cb1f7d56f SHA512 697b97b699052a108c6602fe340ea18c3d4d1e05bd21c1127258d092aff04cc558779ac0da79da849430dada6c23c777f4ae023738762f5b012d523255b0aa53 WHIRLPOOL 1c903eaf22cecbcfe476d76ca67d7dbb2082c8e5bec55dc75dad4fbf0b7af6c889a1e82c7aa4c5e06f38ca43047ba53beb0e601a510b4471a724311a3899dc9b
-DIST meld-1.7.5.tar.xz 406620 SHA256 4043354074ebd7a29f1a246e180bb5d5c1aa771710dd7ae2621f64515210518d SHA512 adc9a869d5d1e954295d123423623d3e862378a9f65740d80b80afdf9f1a80be73bd361bc199e1aa6e6a3474d0c48f9f344f896031b3573351bbf7e01d0603f6 WHIRLPOOL 885317ad3604a2e495f249c5b04e67711afaffb909ff3522cbc0223412f3ce925b4576206916267ebb5791e791cc32affaa9106a29d416d92fc60a8858056e1a
 DIST meld-1.8.0.tar.xz 406752 SHA256 749668f9cbd2f8d11d87b46fda0c1a2190d24668a633d0435ed03d58fc36c65b SHA512 7e074f2a1cc72f7de498c710291ced25b6824069b8b2f76cfa9d4d46e364548298591512d818e39f77af663dd7f960cb79c236972257bbfb53f9b49665bad6d0 WHIRLPOOL 80a13881e132d669c3ab4640ef9f1bdb792be390996761824f5c252843c39d3d141faabaf6439d761c7d6b2778b08652a1a41b8186ae54568e93e4c4953bffb9
+DIST meld-1.8.1.tar.xz 423336 SHA256 f1f13deeb74625a97f97c311eb00665d4a883f0ce705d3299b9c02d50c4ac9c5 SHA512 a1a673092d687f753e3ee514716605cd590a6d6c2334dfb41da8166155630e5b44dff3d1686427d4919e119f23c2d0d341c5eec30982c9ff207683b82931553f WHIRLPOOL 09b350863c085e1eef95ebae11eb908f5718e0f1c7de3521f7014dcfeccd04c3d22c7e7790d9705586635a761944aabf2de33348bcc85eb650958a09c89caa99
 EBUILD meld-1.7.0.ebuild 2400 SHA256 ff06b718876b0b8e97af50147513466425e6026f9e9013570fd39fe73a7564ab SHA512 324e7212736463e4cdd96d83efaee92e613225983b4b2737ba0d078953226749f6225fd1b0abbd59e886fd4993a199acf73407603b48c20edc48d89dfc078a00 WHIRLPOOL db36e5e2d22d84ba6511e18f8fad36f4a6eddd52541261e7ff564b6c2e90c9fc55f76fe4c9a44fb2e7f4de99318b111fa697c939544087bc4b47d92ecda8763f
-EBUILD meld-1.7.4.ebuild 1867 SHA256 31f1737d5dbacdd110be57d4fbcfdd7ee2de8703076b472ef53d26c45325a997 SHA512 2966c8581322068f9931a6393e719ed75982de2849ad7a781b6b5a485cc80221bc1d20a12ea8332b6513ed594ab9bcdeaf801eaf4983b75140132fdf2357ddb2 WHIRLPOOL abfb16e1dfb9c505e5848f09286fedb53d357416fbfe996d9550f6658a7065cf5127d1a2f75931d1f94369fdb1ad2484ffb71a783721d595935c226bf94d16b8
-EBUILD meld-1.7.5.ebuild 1865 SHA256 8f831bb37d78058a0774760e6b712d1d61893e61b05025059a6a3a91f979f851 SHA512 52dd814f7d5ae2e7deb704e5a27c1a8e629d6a951b2b1af79cb5388fa9a258676f37a3b408d715f726c43244d12fb83201652781a8ffa33db52f9e66cbfcfe63 WHIRLPOOL 4d40472eb867436be5b80c1e729a8aa7bd736af15221b38c9379fcbf9eef8eae06b4bc0ef37301196b40480b37063542a93e72e43a0a0440b303480d9885b7b5
 EBUILD meld-1.8.0.ebuild 1865 SHA256 5f1400ea5932659871b1a702bb710cae41cfde5beeb6c92c71e803af01ba7dac SHA512 ff4089ef848d08d8c74e20847d1c4d0e8b771bd16da7e46335cdba7b4c60fe3ff3edc591008ccbed93bcb3d19cace96e6a44c88a956fd91ef0a98748a236d72b WHIRLPOOL ce221e1c1f673b4dcbb64afd9b2fa8818ea30828cff14cbb9ad06c06d1d2dd21491a791e3dfd91577e02909a8d31264d6e5e4a58033c5ab44e57e7001924e23e
-MISC ChangeLog 21800 SHA256 30fd069a5f666612f0a430b4f3745600b535e0233515a4d168f176ec12f046d5 SHA512 49f2475033cff93e33582c6a14131c3f33c6c6ad42bfed46db3cc39c771eda178145beaaf2d9ee0b9e0307b469a132400d3bea92e0ee384ce45d8eca3b539922 WHIRLPOOL fc90aa325354c61dc44731cd0e981dbc1f2e0fae538edae49064c5a0ff58362320912e100053a609445714a5abdf6c9211b47759a778735b527ab89fe7a8d256
+EBUILD meld-1.8.1.ebuild 1867 SHA256 9ea672b17c1ce569ef28967e8b560b37e1427f86f322d2f8f23fe0f6e9753f08 SHA512 5a8fc2bea6752f4169181abc7788bb16b679ec124079b46f9017b378fcff882bd971c207cad8846572ed7caa07710e3a1a85ecc0e6dcd81955510ec3a03cf28e WHIRLPOOL 74d386e8c5a32766f1ff81db87403e7e00848b244cfc18912304b122b51562ca0fc9938e721a8f6a9fb08423f9f551ac76e7b0c23c5d79b887ceef29100158e6
+MISC ChangeLog 21963 SHA256 c340ab72bb7888d4992309820900824616826a4eed4b8629351b0f525583b340 SHA512 0996998436fd18057b85c35f3621681e7a478b86ae583e8ba15abc79a6d45f08aee980cd9838dc28b2d92e1c9dfa86e5622820e4c1f46d37507873fc5fcd8e97 WHIRLPOOL 75b645c8dc1cea4d11f82b81025311d55f8f00e87a507db84e954fff806fc73a5a304a009521efac3409d51d0705a1b86f086409f5a6c6c361dcce4283c1c876
 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlI2ROEACgkQ1fmVwcYIWAZutgCgvSVjp8VBsxq5Ojxju773k/AV
-ktkAn0XCqb0TtPSDjpwgEwnfxjyxN6+s
-=XNBg
+iEYEAREIAAYFAlJHPfYACgkQCaWpQKGI+9TYbQCdHjpZKtpGSK5AhFOfudJ8+qY9
+dWgAnjn1+xMylrru7C0PBgxMqyM2xnlZ
+=vNFv
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.7.5.ebuild b/dev-util/meld/meld-1.7.5.ebuild
deleted file mode 100644
index b3d9e7c767eb..000000000000
--- a/dev-util/meld/meld-1.7.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.5.ebuild,v 1.1 2013/09/01 22:09:39 eva 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}"
-
-# FIXME: switch gconf-python to python-r1
-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 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	app-text/scrollkeeper
-"
-
-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-1.7.4.ebuild b/dev-util/meld/meld-1.8.1.ebuild
index ac505d6bf9fb..5577b5381ed8 100644
--- a/dev-util/meld/meld-1.7.4.ebuild
+++ b/dev-util/meld/meld-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.4.ebuild,v 1.1 2013/07/28 19:46:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.1.ebuild,v 1.1 2013/09/28 20:37:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"