Version bump.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 83 insertions, 62 deletions

diff --git a/media-sound/christine/ChangeLog b/media-sound/christine/ChangeLog
index d8653dc3cece..591c7ae3ebc1 100644
--- a/media-sound/christine/ChangeLog
+++ b/media-sound/christine/ChangeLog
@@ -1,16 +1,22 @@
 # ChangeLog for media-sound/christine
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/christine/ChangeLog,v 1.3 2008/11/25 16:09:08 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/christine/ChangeLog,v 1.4 2009/07/21 15:24:55 ssuominen Exp $
 
-  25 Nov 2008; <ssuominen@gentoo.org> christine-0.1.6.ebuild:
+*christine-0.4.0 (21 Jul 2009)
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +christine-0.4.0.ebuild, +files/christine-0.4.0-no_static_linking.patch:
+  Version bump.
+
+  25 Nov 2008; Samuli Suominen <ssuominen@gentoo.org> christine-0.1.6.ebuild:
   Add missing deps wrt #243068, thanks to basic at mozdev.org and Jim
-  Ramsay. Play addpredict games.
+  Ramsay.
 
   09 Jun 2008; Raúl Porcel <armin76@gentoo.org> christine-0.1.6.ebuild:
   Add ~sparc/~x86
 
 *christine-0.1.6 (08 Jun 2008)
 
-  08 Jun 2008; Samuli Suominen <drac@gentoo.org> +christine-0.1.6.ebuild:
-  Initial commit, thanks to n0sferatu for spiritual support.
+  08 Jun 2008; Samuli Suominen <ssuominen@gentoo.org> +christine-0.1.6.ebuild:
+  Initial commit, thanks to n0sferatu for help.
 
diff --git a/media-sound/christine/christine-0.1.6.ebuild b/media-sound/christine/christine-0.1.6.ebuild
deleted file mode 100644
index 7bb9ee898e31..000000000000
--- a/media-sound/christine/christine-0.1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/christine/christine-0.1.6.ebuild,v 1.3 2008/11/25 16:09:08 ssuominen Exp $
-
-EAPI=1
-
-inherit multilib python
-
-DESCRIPTION="Python, GTK+ and GStreamer based media player (audio and video)"
-HOMEPAGE="http://christine-project.org"
-# It seems 0.x.x-1.tar.bz2 is 0.x.x release, deb lovers..
-SRC_URI="mirror://sourceforge/${PN}/${P}-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="+libnotify readline"
-
-RDEPEND="readline? ( sys-libs/readline )
-	libnotify? ( dev-python/notify-python )
-	>=dev-python/pygtk-2
-	>=dev-python/gconf-python-2
-	>=dev-python/gst-python-0.10
-	>=media-plugins/gst-plugins-meta-0.10
-	media-libs/mutagen"
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool"
-
-src_compile() {
-	addpredict /root/.gconf
-	addpredict /root/.gconfd
-	addpredict /root/.gstreamer-0.10
-	addpredict /root/.gnome2
-	econf --disable-dependency-tracking $(use_with readline)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	# deb lovers again..
-	rm -f "${D}"/createDeb.sh
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/lib${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/lib${PN}
-}
diff --git a/media-sound/christine/christine-0.4.0.ebuild b/media-sound/christine/christine-0.4.0.ebuild
new file mode 100644
index 000000000000..3de94fc86a3a
--- /dev/null
+++ b/media-sound/christine/christine-0.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/christine/christine-0.4.0.ebuild,v 1.1 2009/07/21 15:24:55 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils multilib python
+
+DESCRIPTION="Python, GTK+ and GStreamer based media player (audio and video)"
+HOMEPAGE="http://christine-project.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="libnotify nls readline"
+
+RDEPEND="readline? ( sys-libs/readline )
+	libnotify? ( dev-python/notify-python )
+	dev-python/pygtk
+	dev-python/gconf-python
+	dev-python/gst-python:0.10
+	media-plugins/gst-plugins-meta:0.10
+	media-libs/mutagen"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext
+		dev-util/intltool )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no_static_linking.patch
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /root/.gstreamer-0.10
+
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable nls) \
+		$(use_with readline)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/lib${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/media-sound/christine/files/christine-0.4.0-no_static_linking.patch b/media-sound/christine/files/christine-0.4.0-no_static_linking.patch
new file mode 100644
index 000000000000..81caa016fea1
--- /dev/null
+++ b/media-sound/christine/files/christine-0.4.0-no_static_linking.patch
@@ -0,0 +1,14 @@
+diff -ur christine-0.4.0.orig/Makefile.am christine-0.4.0/Makefile.am
+--- christine-0.4.0.orig/Makefile.am	2009-05-01 07:37:57.000000000 +0300
++++ christine-0.4.0/Makefile.am	2009-07-21 18:19:31.000000000 +0300
+@@ -68,8 +68,8 @@
+ 	./christine --devel $*
+ 
+ christine: Makefile $(srcdir)/christine.c
+-	gcc -Wall -fPIC ${CFLAGS} -I${pythonincludedir}/ -c christine.c -o christine.o
+-	gcc ${pythonlfs} christine.o -lnsl -ldl -lieee -lpthread -lutil -lm -lpython${pythonversion} ${pythonlibdir}/libpython${pythonversion}.a -o christine
++	$(CC) -Wall -fPIC ${CFLAGS} -I${pythonincludedir}/ -c christine.c -o christine.o
++	$(CC) ${LDFLAGS} ${pythonlfs} christine.o -lnsl -ldl -lieee -lpthread -lutil -lm -lpython${pythonversion} -o christine
+ 	python -c "import compileall,re; compileall.compile_dir('./', rx=re.compile('/[.]svn'),force=True, maxlevels=11)"
+ 
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/media-sound/christine/metadata.xml b/media-sound/christine/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-sound/christine/metadata.xml
+++ b/media-sound/christine/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>