version bump (bug #298798) with ebuild submission from Samuli Suominen

Package-Manager: portage-2.1.6.13/cvs/Linux i686

6 files changed, 113 insertions, 4 deletions

diff --git a/games-puzzle/cuyo/ChangeLog b/games-puzzle/cuyo/ChangeLog
index 798b297d2781..a570116930a0 100644
--- a/games-puzzle/cuyo/ChangeLog
+++ b/games-puzzle/cuyo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/cuyo
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/ChangeLog,v 1.19 2009/02/17 00:02:31 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/ChangeLog,v 1.20 2009/12/30 19:33:35 mr_bones_ Exp $
+
+*cuyo-2.1.1 (30 Dec 2009)
+
+  30 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> +cuyo-2.1.1.ebuild,
+  +files/cuyo-2.1.1-gcc44.patch, +files/cuyo-2.1.1-gentoo.patch,
+  metadata.xml:
+  version bump (bug #298798) with ebuild submission from Samuli Suominen
 
   17 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> cuyo-1.8.6.ebuild:
   EAPI=2; add desktop entry (bug #259237)
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
index a567501749af..910d76dd8248 100644
--- a/games-puzzle/cuyo/Manifest
+++ b/games-puzzle/cuyo/Manifest
@@ -1,5 +1,9 @@
 AUX cuyo-1.8.6-gcc4.patch 387 RMD160 95f3aba6ffa81ff45d14617f6b62e851b7e85ef3 SHA1 f33d4da3d7a8f840be526972b283f95acb0d5278 SHA256 f4087f65a831c93d1196fcf01ea74cf739869308f4a6c8a867ae9aa76028b47e
+AUX cuyo-2.1.1-gcc44.patch 307 RMD160 40abe4cb601ccd03bfdc83467650a061ec63363a SHA1 4aba470d41e87bf5e95a3aaf85f12ec139c7c74f SHA256 8d4a6de25da0d8cb5cc291352801fba5a5045b216112baccb25bc291b88afe47
+AUX cuyo-2.1.1-gentoo.patch 1149 RMD160 278e6c9808f64837e3c94ab372d7e32fbcd1325b SHA1 bdcb9ca3b750f43a484be9d6bb5aaf2b2ea2bf8e SHA256 5bee2d573a54b54ef9af94a0c705f8a06f0925c8490525a0487dbdf56b510651
 DIST cuyo-1.8.6.tar.gz 1444617 RMD160 6b39aa146dbcfb4c51b511fce495bec7876a53a6 SHA1 c50ac76ae0c4c68ee841f99d51ff6392b916d602 SHA256 4b8ed5fa01ec922f19d52a7da9538a55a6bbe4c728c904a49ffeb7e3174d1f6d
+DIST cuyo-2.~-1.1.tar.gz 3005426 RMD160 2c7e950d7367a6a1c18fe01df649a9eaa8bea3e2 SHA1 85965543f3ef30d269ff1cbabcfda05fa6beb6e8 SHA256 7157aa70ae731c17e765fba11736866f2020826ad6187d8df6c55039d4481de6
 EBUILD cuyo-1.8.6.ebuild 1049 RMD160 2006c6ee8775ac25b28da305a1288cf3211e5733 SHA1 5c292246be2430731b52842b84901b033b8efe27 SHA256 3ce69de77ec7898665e5b060737cc778567c41d39a8f685565707a47889ea8f0
-MISC ChangeLog 2649 RMD160 21511a14624b9c778881e821b3f38744e2f5f3ba SHA1 ff6ff298a00e12c449f9d940f081a178ceb3980f SHA256 f7ebabeef9ce6b2e72672dfa9979e062f80926ae9af813c2c43149d8161d2113
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+EBUILD cuyo-2.1.1.ebuild 1151 RMD160 c8a4c044f13ef6f22c4d8be41803a4164e2b99d3 SHA1 6bc6fcc06723a19cebe8c46ab352b4729eb98eef SHA256 3e22f67b4df19f307ada52a99d8b239827d1482408d24c4a31289208cff8fb91
+MISC ChangeLog 2906 RMD160 cd7f74105afa05c35640c1812a676696720afce2 SHA1 bdd240f562f59e6c8b0bf5b34943c3fe20e82310 SHA256 784618b7c22bf81ea4e19503e535e03c1630d09f810a7ca025d44cc36a09579f
+MISC metadata.xml 233 RMD160 a079cd712f408ce26c6879e68e447283b53dd745 SHA1 f0f183b24003324cfde44e939b0f81a7a21fd43f SHA256 ab768dac9c6beecbabb1f5d7fa32c2de31e6bb2f45d1745b04fe54bf16de680c
diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
new file mode 100644
index 000000000000..420f80f92018
--- /dev/null
+++ b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/cuyo-2.1.1.ebuild,v 1.1 2009/12/30 19:33:35 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools gnome2-utils versionator 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+music"
+
+DEPEND="sys-libs/zlib
+	media-libs/libsdl[audio,video]
+	media-libs/sdl-mixer
+	music? ( media-libs/sdl-mixer[mikmod] )
+	media-libs/sdl-image"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
new file mode 100644
index 000000000000..60ed1fffaf2f
--- /dev/null
+++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur cuyo-2.~-1.1.orig/src/stringzeug.h cuyo-2.~-1.1/src/stringzeug.h
+--- cuyo-2.~-1.1.orig/src/stringzeug.h	2006-07-03 20:26:23.000000000 +0300
++++ cuyo-2.~-1.1/src/stringzeug.h	2009-12-29 16:17:18.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ #include <string>
+-
++#include <stdio.h>
+ 
+ 
+ 
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
new file mode 100644
index 000000000000..38b8c4224463
--- /dev/null
+++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
@@ -0,0 +1,32 @@
+diff -ru cuyo-2.~-1.1.orig/icons/Makefile.am cuyo-2.~-1.1/icons/Makefile.am
+--- cuyo-2.~-1.1.orig/icons/Makefile.am	2007-12-20 12:22:32.000000000 -0500
++++ cuyo-2.~-1.1/icons/Makefile.am	2009-12-30 13:44:39.111042770 -0500
+@@ -1,4 +1,4 @@
+-desktopdir = $(datadir)/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 = $(datadir)/icons/hicolor
++iconsdir = /usr/share/icons/hicolor
+ icons_DATA = cuyo-32x32.png cuyo-64x64.png
+ 
+ install-iconsDATA:
+diff -ru cuyo-2.~-1.1.orig/icons/cuyo.desktop cuyo-2.~-1.1/icons/cuyo.desktop
+--- cuyo-2.~-1.1.orig/icons/cuyo.desktop	2007-12-20 12:22:32.000000000 -0500
++++ cuyo-2.~-1.1/icons/cuyo.desktop	2009-12-30 13:45:15.823781932 -0500
+@@ -3,9 +3,8 @@
+ Icon=cuyo
+ Type=Application
+ Terminal=false
+-MimeType=application/x-executable
++MimeType=application/x-executable;
+ Categories=Game;BlocksGame;
+-Encoding=UTF-8
+ Comment=A tetris like game with many levels
+ Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
+ Exec=cuyo
diff --git a/games-puzzle/cuyo/metadata.xml b/games-puzzle/cuyo/metadata.xml
index d3c2cc926f0b..658a1ecd0c6d 100644
--- a/games-puzzle/cuyo/metadata.xml
+++ b/games-puzzle/cuyo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+<use>
+	<flag name="music">Enable playing of background music</flag>
+</use>
 </pkgmetadata>