Version bump. Force at least Python >= 2.7 with USE="sqlite" enabled and use python.eclass wrt #313937 by Ian Delaney and Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 105 insertions, 8 deletions

diff --git a/media-sound/christine/ChangeLog b/media-sound/christine/ChangeLog
index 49fb12a4f4ff..401e7e12791b 100644
--- a/media-sound/christine/ChangeLog
+++ b/media-sound/christine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/christine
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/christine/ChangeLog,v 1.7 2011/07/07 15:29:58 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/christine/ChangeLog,v 1.8 2012/02/15 00:09:28 ssuominen Exp $
+
+*christine-0.7.0 (15 Feb 2012)
+
+  15 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> +christine-0.7.0.ebuild,
+  +files/christine-0.7.0-validate.patch:
+  Version bump. Force at least Python >= 2.7 with USE="sqlite" enabled and use
+  python.eclass wrt #313937 by Ian Delaney and Arfrever Frehtes Taifersar
+  Arahesis.
 
   07 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> christine-0.4.0.ebuild:
   Change away from deprecated python.eclass functions by Arfrever.
diff --git a/media-sound/christine/Manifest b/media-sound/christine/Manifest
index 4aea0a09be2e..68b0eafd9e2d 100644
--- a/media-sound/christine/Manifest
+++ b/media-sound/christine/Manifest
@@ -1,15 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX christine-0.4.0-no_static_linking.patch 879 RMD160 cd5c2066262cda8ed4905a2a9fc89bf139c5ab3e SHA1 08540d590e3f674417cd0f64f3af39e7126e70a1 SHA256 8a8134de4bf421ce38e48a843e1992116cc19bf9961bce1723efa1c6be746145
+AUX christine-0.7.0-validate.patch 1834 RMD160 23bff1305586ca3518958cdeb31914741c14d779 SHA1 35ec6f52e8b90cef13ff8cc638edd65976d00667 SHA256 5a787e7b2cf8dcb2b8166db9362f35ac011c9f71f3ee14476bf443da62440d0c
 DIST christine-0.4.0.tar.bz2 456824 RMD160 b56a073ad12127baa554bfe3b96bef2fbdc60987 SHA1 50c08e908a1f12966f2061d83a44d94f9d9c9a31 SHA256 ded7d0286d0f815702899f3fb460c58dbca380bf5fa88acaeaa79088fe888aa4
+DIST christine-0.7.0.tar.bz2 421633 RMD160 6655faae0df7766fc074231064d069ae15a0672d SHA1 4bfbba0fd3c4c1aba3ec263ac4c73976be3ecffe SHA256 de146b950b73692361ff3fcb8122ed2445d5aae07ad6a016117548bfbfe24660
 EBUILD christine-0.4.0.ebuild 1303 RMD160 3956f4228e196ca5da8323a92ed4b60a34a4dbc1 SHA1 a1ec845fb099756bb4b4d152e9e4c23667c9f10b SHA256 9c87d0543df639f616a46065e02c28389e2961a2e58dd1d117fe065413ec3387
-MISC ChangeLog 1267 RMD160 1dbbc4d644aeec28b8cee1f7e4ba61b08213255d SHA1 79211dae1c4b76ab70fd5c18ef693d4add3787f9 SHA256 dba7bf9c0453efd0fa279b7c2241d43b9dd966c9f8a963c933d183ea6cce1015
+EBUILD christine-0.7.0.ebuild 1196 RMD160 c3387f6dc70e754e33b153788a58a1744a6a3ebc SHA1 e9e03bdb46e9e2b63135451a69da9ca37901aa85 SHA256 3606c8e16230a46ab6509e1eb1d6e51128a67e1101ab38aaafab851744cea018
+MISC ChangeLog 1585 RMD160 04e0162195daf43446863a36b584b0df9ab2b66f SHA1 1bf0e36ed4a082ee59d2723db1346f757ab85b11 SHA256 f51c468e55a7bd40cf70dfcaf060ddb0dfe417cb0927f6419a4f6ea8f429b17d
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4V0KgACgkQXkR9YqOcLPGbrgEAlR64U5L3Jy4AaOOI/omuLAOA
-DrZIv+/+u6cRDXhuzF0A/06XumcLt5ncrKymbY7P3ymy7oyM7XHaOKDhSS5eihLZ
-=vprw
+iQEcBAEBAgAGBQJPOvcFAAoJEEdUh39IaPFNN6YH/13nNEq8TQ2M2mFzQecgdYul
+p2CkYc4O032QP7S1TeOzKLR1AHnD64MNj6hDd5jH1SvQnuIBzpLKDT0q4q3ETixG
+WIdyok1Rebp+FTpXqSWZdBd6UunmH9v6XAuGv+/BXC3JSjNIebNfyLs6sSp8QOtD
+5MXmAKC/X0Bu/8gL3j1FuCWxIQcbx+WeY0xhWzsCPBqiTzdVapIpKYFbefJLgdGp
+8Hw6NXeJ85hDKGc9agTSnNXo+y1lz2bUhB1CcZNUQxhZNynQzZnmRJ1BJ40DJd7P
+TlHyyIfBDvJJiyDx4lOUTgCsyP/49tSNyqDY9MlHpw6LSg3fQ8AOPw8jRs1ZjqU=
+=baKE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/christine/christine-0.7.0.ebuild b/media-sound/christine/christine-0.7.0.ebuild
new file mode 100644
index 000000000000..bec813176ca1
--- /dev/null
+++ b/media-sound/christine/christine-0.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/christine/christine-0.7.0.ebuild,v 1.1 2012/02/15 00:09:28 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="sqlite"
+
+inherit autotools eutils python
+
+DESCRIPTION="A simple gstreamer based media player"
+HOMEPAGE="http://christine-project.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify nls readline"
+
+COMMON_DEPEND="=dev-python/gst-python-0.10*
+	dev-python/pycairo
+	dev-python/pygobject:2
+	=dev-python/pygtk-2*
+	media-libs/mutagen
+	libnotify? ( dev-python/notify-python )
+	readline? ( sys-libs/readline )"
+RDEPEND="${COMMON_DEPEND}
+	=media-plugins/gst-plugins-meta-0.10*"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	nls? ( dev-util/intltool )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-validate.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls) $(use_with readline)
+}
+
+pkg_postinst() { python_mod_optimize libchristine; }
+pkg_postrm() { python_mod_cleanup libchristine; }
diff --git a/media-sound/christine/files/christine-0.7.0-validate.patch b/media-sound/christine/files/christine-0.7.0-validate.patch
new file mode 100644
index 000000000000..76d5b146c345
--- /dev/null
+++ b/media-sound/christine/files/christine-0.7.0-validate.patch
@@ -0,0 +1,33 @@
+error: value "0.7.0" for key "Version" in group "Desktop Entry" is not a known version
+warning: key "Encoding" in group "Desktop Entry" is deprecated
+error: value "GTK;Application;AudioVideo" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+error: value "application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;video/mpeg;video/x-avi;video/x-ms-wmv;video/quicktime;video/x-ms-asf;video/x-msvideo" for string list key "MimeType" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+
+--- christine.desktop.in
++++ christine.desktop.in
+@@ -6,10 +6,8 @@
+ TryExec=@programname@
+ Terminal=false
+ Type=Application
+-Version=@VERSION@
+-Encoding=UTF-8
+-Categories=GTK;Application;AudioVideo
+-MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;video/mpeg;video/x-avi;video/x-ms-wmv;video/quicktime;video/x-ms-asf;video/x-msvideo
++Categories=GTK;AudioVideo;
++MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;video/mpeg;video/x-avi;video/x-ms-wmv;video/quicktime;video/x-ms-asf;video/x-msvideo;
+ StartupNotify=true
+ Name[es]=Reproductor Multimedia Christine
+-Comment[es]= Reproductor multimedia basado en gstreamer
++Comment[es]=Reproductor multimedia basado en gstreamer
+--- Makefile.am
++++ Makefile.am
+@@ -53,8 +53,7 @@
+ 	   -e 's,@datadir\@,$(pkgdatadir),g' \
+ 	   -e 's,@prefix\@,$(prefix),g' \
+ 	   -e 's,@sysconfdir\@,$(pkgsysconfdir),g' \
+-	   -e 's,@programname\@,$(PROGRAM_NAME),g' \
+-	   -e 's,@VERSION\@,$(VERSION),g'
++	   -e 's,@programname\@,$(PROGRAM_NAME),g'
+ 
+ clean-local:
+ 	rm -rf christine.desktop