version bump (upstream version number method changed) (bug #459070); clean old (but looks newer) version

Package-Manager: portage-2.2.14/cvs/Linux x86_64

6 files changed, 50 insertions, 85 deletions

diff --git a/games-puzzle/cuyo/ChangeLog b/games-puzzle/cuyo/ChangeLog
index a883b366ab82..24f48d898783 100644
--- a/games-puzzle/cuyo/ChangeLog
+++ b/games-puzzle/cuyo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-puzzle/cuyo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/ChangeLog,v 1.27 2015/02/18 22:11:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/ChangeLog,v 1.28 2015/02/18 22:31:39 mr_bones_ Exp $
+
+*cuyo-2.0.0 (18 Feb 2015)
+
+  18 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> +cuyo-2.0.0.ebuild,
+  +files/cuyo-2.0.0-gentoo.patch, -cuyo-2.1.2.ebuild,
+  -files/cuyo-2.1.2-gcc44.patch, -files/cuyo-2.1.2-gentoo.patch:
+  version bump (upstream version number method changed) (bug #459070); clean old
+  (but looks newer) version
 
 *cuyo-2.1.2 (18 Feb 2015)
 
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
index 5ef478c2e824..141c172d6c35 100644
--- a/games-puzzle/cuyo/Manifest
+++ b/games-puzzle/cuyo/Manifest
@@ -1,10 +1,9 @@
+AUX cuyo-2.0.0-gentoo.patch 1126 SHA256 e32f8c32ce35c04a1c4c2a7009032602b6e9bba5f904c55dbaabaa895fae823d SHA512 1d1a966513e0ed8a7a7dd73a6e88149c2e525bec2afb04bf142ca09e06188af1061e504d50c5bac391ddf1e9b730b88fa9f919f3b4a1dd890ef57ae9efdadd06 WHIRLPOOL c0d5b5b29ff5c40b18e840ddc582f32da967cb85b7b218a33c5e0f99d9462a9ef4af99118417ca16a35d1cf83ad4e961730f42c2c75eb082044529e279c335ae
 AUX cuyo-2.1.1-gcc44.patch 161 SHA256 3a21073002a39d615bf25cb6e3db942a8a20461c5cd7c2f7da1b511ed95fc53a SHA512 461bd27073288eb5327770d18ce5a10a38a4e6ceb3c6f5e39a50a47bc3f6f5c8a06f9ac13d80bfbbeae1a0f45dd62ee0fa084dd832eb2d1313096f3d8e5c3149 WHIRLPOOL 703e02ef5319ecffce0e0cb7286ab3662a6cb956cffdaab9d7894839d7d6c77b7cb8428de4dd74b5dc6a501693960e18eb1f6283b193f705ac9f7a99ebd5e681
 AUX cuyo-2.1.1-gentoo.patch 851 SHA256 45d50bf95e8cdec4d18c91b359c3796f55c667acb4a7e32062721d1fbcd369d9 SHA512 c96c855c4650f50d6ed1c38d7105047f386c1828592389ce482cecefeb46bae224ee46f6f07dc63bbed67d81e4beadd5868962ad52dcca8fd9f99f3ea0899f8a WHIRLPOOL 9bdc53e27d453a62171dae2440614bca0068877e83c8ba6c852b4d546cae5871d25398be003193165ed9a16b278b37b7666fdc86146ff3a210f8cfa2c1d61bb1
-AUX cuyo-2.1.2-gcc44.patch 161 SHA256 3a21073002a39d615bf25cb6e3db942a8a20461c5cd7c2f7da1b511ed95fc53a SHA512 461bd27073288eb5327770d18ce5a10a38a4e6ceb3c6f5e39a50a47bc3f6f5c8a06f9ac13d80bfbbeae1a0f45dd62ee0fa084dd832eb2d1313096f3d8e5c3149 WHIRLPOOL 703e02ef5319ecffce0e0cb7286ab3662a6cb956cffdaab9d7894839d7d6c77b7cb8428de4dd74b5dc6a501693960e18eb1f6283b193f705ac9f7a99ebd5e681
-AUX cuyo-2.1.2-gentoo.patch 1937 SHA256 96ff19a1c14c487798eb26905bdfdc11479d936340412923583f8df01e350285 SHA512 5086486e422f60b62b0a546946c8b719ededa0910abf91286357c9743f318616f4d8451c5f929af809ad4e6a06952aaced31585719f94bada1bede70c78d1874 WHIRLPOOL af631b3782d6f3af70c79071455c5dd366590c6749ede2a1604ba53ad7cbf3cc9f79ee7be779e1fddf1e3d62cb0a56388fa54e3220c6acf0f2fd9eadc939862f
+DIST cuyo-2.0.0.tar.gz 3821330 SHA256 531cfb989087199f643ac4b18ff9cc50793cc3fa07ee06f394f73d153c09ae34 SHA512 5a25b7807b904731acc386c6b77bee82820f85a5be1ca8cf20f2b37a79f08af3649c95311b6bc656bf8780cbd99a122f7908576a424bba1439c7e5bd586ec214 WHIRLPOOL dfe71ccfb69a86dc22ed9585a6a296e82ff42b1300f65e9b30c4c17b01a1057fe1ffb2b2d5dc5d1b6c0846d8a93be409785322d94f01f18f1465687ba11bdbb4
 DIST cuyo-2.~-1.1.tar.gz 3005426 SHA256 7157aa70ae731c17e765fba11736866f2020826ad6187d8df6c55039d4481de6 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787 WHIRLPOOL ef2817feecbe9c785e8d6438aca123247857c8f9845421a5aef89375b0f9c15a050d0e6f16791cab408f8e87a9640ef0cbc77c9cc89f03c5e788d3851b07af2d
-DIST cuyo-2.~-1.2.tar.gz 3238584 SHA256 3fb44af4e6f8d205d11d44b5a96ffa4a11eab5a4fa86897463c0c6ca0658adb0 SHA512 830cdc3947693fbda1ca2b5fb5aa912a83fa1f1f0090b5f84da9d8100e6251502361bb8564601ec26aa926cf4f7832b7e2d0d6ff60a7a419cbc46e225e1d7777 WHIRLPOOL 8d335de30ba415a4266257482c8a68750fdfcc94fa7f2d850774aa69fae1219c3062ef01303c01c3dd80816677ab2702a1c2cb64c4f85c61960c868c88cd0a1c
+EBUILD cuyo-2.0.0.ebuild 986 SHA256 f6fee167139fcc9221b525b70647417350f979d7b5cbf181856d43360e900bad SHA512 922ee9437091538656cb7c8d16408d20d8aa2c61b46b1ebc9d3107943ed6bf42c9d994fb8daae6f4f4d4a0255a4d3aaec18d10ab37139e32ae637bbbc688600d WHIRLPOOL efd6478e30bdffb5f662843934fea41a5d09124db8a62d8d596b79789df2bb310f1ebd7ec0894e467530c077fbd4be9302dad3806fba9d377d59569c6fee1ac3
 EBUILD cuyo-2.1.1.ebuild 1099 SHA256 d95373e132d82a462625224920794a577e2df4ba8ac9a0b66651014a59e3d0e1 SHA512 c661c49b6b806e7d3bf64f946b3fa37db9be8fce74f25c1883c9277d768d950f7c52757e44b829be7970a867c7fd72cb74e1aa9feeb5149024d9548a3b4d56fb WHIRLPOOL e551e6a288def3e3a9f30a403002a5953d0967fc139ea132a32efc8b621c59b278e3f27c745473ee72ca88d38b453524c128427aab5ce81c1a2a16ea35150d60
-EBUILD cuyo-2.1.2.ebuild 1207 SHA256 d99e44582c731bf936754794d272f78ca26d2a509e166289a85d2433fcae289f SHA512 6715de1bd9fc806a7d65dc434a90150540ecf7a4508504fa976ea49e8f942b2d514092a8b1ae87c3baf51dc050b17b21dd49cecc5b8d267120e1d13fd691fd29 WHIRLPOOL ebbdc39a30deab0b61c792670904d4d312f8687b2d1e8c6ccb8cf456af8df951fa483dc4011f5b5184074d13c9bffdd57c27e9a3b926da9bb19334a70dc3ba68
-MISC ChangeLog 3843 SHA256 4a53e39ce60da0796acf36c4c86ad051c75088a73d9e4fc26ab5e338f27e6c06 SHA512 c96764dce421c0731cd4a4e71f938465b836157453461007525e57baa51ec9d8e410dcaf1498b59cc0d1ff1706016a334ae802256616f2fb7406fb7cbc7f4dd4 WHIRLPOOL b7399070d019a0a3d92038d5f3b5ab0891203fc14b94233cd7894b90f9ebf490298fd767382a0c296ad7ebe5f4a9424ad7d066fbe62f716676e994e409c73401
+MISC ChangeLog 4174 SHA256 a490c43af134892bc2b19adb8aa1c7b4292e4c039defb04c255c363f0a53dedb SHA512 9e888c0ab9b3377c9653412354659025202addbdad9a8504f7daa08bcdfda0dc49ccd8f6f0e3e7fa3e6d2be58710c7daeab78597a4df166c65d4a4d43736665c WHIRLPOOL ca33bbe04de0a9a5db3898b7e5a8854eeee1c468319ed9a02914e177dda31d98cccf3caf061641d684959f41ea056f6552f6903a1227f16c33dc6c01845c0eb1
 MISC metadata.xml 233 SHA256 ab768dac9c6beecbabb1f5d7fa32c2de31e6bb2f45d1745b04fe54bf16de680c SHA512 994895df8adbc53530ce51bcd305ad439f551fded2543f442ffc28da061d32e6074c457ce7ce45d61c2fc6f04f0dcd03b89d49a2c6a66619de3890736ef3684e WHIRLPOOL 1a5d89c510a3b9e5f9ff1df8ec464c0e4f957e5c946b345ebcebd061c11cfa76eea60c076baad0828bb8820abea60c4e4997917e38a50ae654dea71c73b7a010
diff --git a/games-puzzle/cuyo/cuyo-2.1.2.ebuild b/games-puzzle/cuyo/cuyo-2.0.0.ebuild
index e7ed92c0f30c..5fab57f514e6 100644
--- a/games-puzzle/cuyo/cuyo-2.1.2.ebuild
+++ b/games-puzzle/cuyo/cuyo-2.0.0.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/cuyo-2.1.2.ebuild,v 1.1 2015/02/18 22:11:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/cuyo-2.0.0.ebuild,v 1.1 2015/02/18 22:31:39 mr_bones_ Exp $
 
 EAPI=5
-inherit autotools eutils gnome2-utils versionator games
+inherit autotools eutils gnome2-utils games
 
-MY_P=${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)
 DESCRIPTION="highly addictive and remotely related to tetris"
 HOMEPAGE="http://www.karimmi.de/cuyo/"
-SRC_URI="http://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/cuyo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+music"
@@ -24,15 +23,8 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-	sed -i \
-		-e '/^[[:space:]]*$/d' \
-		icons/cuyo.desktop || die
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	eautoreconf
 }
 
diff --git a/games-puzzle/cuyo/files/cuyo-2.0.0-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.0.0-gentoo.patch
new file mode 100644
index 000000000000..473ef3209f29
--- /dev/null
+++ b/games-puzzle/cuyo/files/cuyo-2.0.0-gentoo.patch
@@ -0,0 +1,32 @@
+diff -ru cuyo-2.0.0.orig/icons/Makefile.am cuyo-2.0.0/icons/Makefile.am
+--- cuyo-2.0.0.orig/icons/Makefile.am	2012-01-12 12:51:05.000000000 -0500
++++ cuyo-2.0.0/icons/Makefile.am	2015-02-18 17:19:55.320961943 -0500
+@@ -17,7 +17,7 @@
+ #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #
+ 
+-desktopdir = $(datarootdir)/applications
++desktopdir = /usr/share/applications
+ desktop_DATA = cuyo.desktop
+ 
+ 
+@@ -32,7 +32,7 @@
+ #	echo "Exec=$(bindir)/cuyo" >> cuyo.desktop
+ 
+ 
+-iconsdir = $(datarootdir)/icons/hicolor
++iconsdir = /usr/share/icons/hicolor
+ nobase_icons_DATA = 32x32/apps/cuyo.png 64x64/apps/cuyo.png
+ 
+ EXTRA_DIST = $(nobase_icons_DATA) cuyo.desktop
+diff -ru cuyo-2.0.0.orig/icons/cuyo.desktop cuyo-2.0.0/icons/cuyo.desktop
+--- cuyo-2.0.0.orig/icons/cuyo.desktop	2011-03-26 11:20:01.000000000 -0400
++++ cuyo-2.0.0/icons/cuyo.desktop	2015-02-18 17:19:26.506082349 -0500
+@@ -4,7 +4,6 @@
+ Type=Application
+ Terminal=false
+ Categories=Game;BlocksGame;
+-Encoding=UTF-8
+ Comment=Play a tetris like game with many levels
+ Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+ Exec=cuyo
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.2-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.2-gcc44.patch
deleted file mode 100644
index 9ad50b067fb5..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.2-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cuyo-2.~-1.1.orig/src/stringzeug.h
-+++ cuyo-2.~-1.1/src/stringzeug.h
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- #include <string>
--
-+#include <stdio.h>
- 
- 
- 
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.2-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.2-gentoo.patch
deleted file mode 100644
index 6fb2a0db398b..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.2-gentoo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- po/Makefile.am
-+++ po/Makefile.am
-@@ -60,7 +60,7 @@
- 
- # By virtue of this rule, more precisely by virtue of genpot, this Makefile
- # probably only works with srcdir=.
--$(DOMAIN).pot: $(pot_sources)
-++$(DOMAIN).pot: $(pot_sources)
- 	./genpot
- 
- %.mo: %.po
---- po/genpot
-+++ po/genpot
-@@ -27,10 +27,10 @@
-     -o - \
-     src/* data/* \
-   | sed \
--    -e "1 s/SOME DESCRIPTIVE TITLE/Message catalog for the game Cuyo/" \
--    -e "2 s/Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER/This is a partly generated file. The copyright of the original messages is identical to the one of the source files they are generated from. The copyright of the translations is by the translators./" \
--    -e "3,9 s/PACKAGE/Cuyo/" \
--    -e "16 s/CHARSET/ASCII/" \
-+    -e "s/SOME DESCRIPTIVE TITLE/Message catalog for the game Cuyo/" \
-+    -e "s/Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER/This is a partly generated file. The copyright of the original messages is identical to the one of the source files they are generated from. The copyright of the translations is by the translators./" \
-+    -e "s/PACKAGE/Cuyo/" \
-+    -e "s/CHARSET/ASCII/" \
-   | msgconv -t ISO-8859-1 \
-   > cuyo.pot
-
---- icons/cuyo.desktop
-+++ icons/cuyo.desktop
-@@ -5,7 +5,6 @@
- Terminal=false
- MimeType=application/x-executable;
- Categories=Game;BlocksGame;
--Encoding=UTF-8
- Comment=Play a tetris like game with many levels
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
- Exec=cuyo 
---- icons/Makefile.am
-+++ icons/Makefile.am
-@@ -1,4 +1,4 @@
--desktopdir = $(datarootdir)/applications
-+desktopdir = /usr/share/applications
- desktop_DATA = cuyo.desktop
- 
- 
-@@ -25,7 +25,7 @@
- # Das vorige war falsch: die png sollen alle cuyo.png heissen
- # und nicht cuyo-xxxx.png. Deshalb nachfolgend neue Version:
- 
--iconsdir = $(datarootdir)/icons/hicolor
-+iconsdir = /usr/share/icons/hicolor
- icons_DATA = cuyo-32x32.png cuyo-64x64.png
- 
- install-iconsDATA: