Version bump.

(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)

5 files changed, 77 insertions, 74 deletions

diff --git a/media-sound/gpodder/ChangeLog b/media-sound/gpodder/ChangeLog
index c2bcf12169a9..4e5ed51eb631 100644
--- a/media-sound/gpodder/ChangeLog
+++ b/media-sound/gpodder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/gpodder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gpodder/ChangeLog,v 1.26 2010/01/07 14:37:19 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gpodder/ChangeLog,v 1.27 2010/10/31 18:05:20 ssuominen Exp $
+
+*gpodder-2.9 (31 Oct 2010)
+
+  31 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> +gpodder-2.9.ebuild:
+  Version bump.
 
   07 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   gpodder-0.17.0.ebuild:
diff --git a/media-sound/gpodder/gpodder-0.12.1.ebuild b/media-sound/gpodder/gpodder-0.12.1.ebuild
deleted file mode 100644
index 4324c1a3635d..000000000000
--- a/media-sound/gpodder/gpodder-0.12.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gpodder/gpodder-0.12.1.ebuild,v 1.3 2009/08/15 15:02:19 ssuominen Exp $
-
-EAPI=2
-inherit distutils
-
-DESCRIPTION="gPodder is a Podcast receiver/catcher written in Python, using GTK."
-HOMEPAGE="http://gpodder.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ipod libnotify"
-
-RESTRICT="test"
-
-RDEPEND="dev-python/feedparser
-	dev-python/pygtk
-	sys-devel/gettext
-	libnotify? ( dev-python/notify-python )
-	>=dev-python/pysqlite-2.4
-	ipod? ( || ( dev-python/eyeD3 dev-python/pymad )
-		media-libs/libgpod[python]
-	)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	media-gfx/imagemagick[png]
-	sys-apps/help2man"
-
-src_compile() {
-	emake generators || die
-	emake messages || die
-	distutils_src_compile
-}
diff --git a/media-sound/gpodder/gpodder-0.17.0.ebuild b/media-sound/gpodder/gpodder-0.17.0.ebuild
deleted file mode 100644
index 25d9153e03f1..000000000000
--- a/media-sound/gpodder/gpodder-0.17.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gpodder/gpodder-0.17.0.ebuild,v 1.2 2010/01/07 14:37:19 fauli Exp $
-
-EAPI=2
-
-inherit distutils
-
-DESCRIPTION="gPodder is a Podcast receiver/catcher written in Python, using GTK."
-HOMEPAGE="http://gpodder.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="ipod libnotify mad"
-RESTRICT="test"
-
-RDEPEND="dev-python/feedparser
-	dev-python/pygtk
-	sys-devel/gettext
-	libnotify? ( dev-python/notify-python )
-	>=dev-python/pysqlite-2.4
-	dev-python/eyeD3
-	ipod? ( media-libs/libgpod[python] )
-	mad? ( dev-python/pymad )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	media-gfx/imagemagick[png]
-	sys-apps/help2man"
-
-src_compile() {
-	emake generators || die
-	emake messages || die
-	distutils_src_compile || die
-}
diff --git a/media-sound/gpodder/gpodder-2.9.ebuild b/media-sound/gpodder/gpodder-2.9.ebuild
new file mode 100644
index 000000000000..92edcae70f50
--- /dev/null
+++ b/media-sound/gpodder/gpodder-2.9.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gpodder/gpodder-2.9.ebuild,v 1.1 2010/10/31 18:05:20 ssuominen Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils gnome2-utils
+
+DESCRIPTION="gPodder is a Podcast receiver/catcher written in Python, using GTK."
+HOMEPAGE="http://gpodder.org/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth gstreamer ipod mtp webkit"
+
+RDEPEND="dev-python/eyeD3
+	dev-python/feedparser
+	dev-python/imaging
+	>=dev-python/mygpoclient-1.4
+	>=dev-python/pygtk-2.12
+	dbus? ( dev-python/dbus-python )
+	bluetooth? ( net-wireless/bluez )
+	gstreamer? ( dev-python/gst-python )
+	ipod? ( media-libs/libgpod[python] )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	webkit? ( dev-python/pywebkitgtk )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-apps/help2man
+	test? ( dev-python/minimock
+		dev-python/coverage )"
+
+src_prepare() {
+	sed -i \
+		-e 's:make -C:$(MAKE) -C:' \
+		Makefile || die
+
+	distutils_src_prepare
+}
+
+src_compile() {
+	emake data/org.gpodder.service || die
+	emake messages || die
+
+	distutils_src_compile
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	distutils_pkg_postrm
+}
diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml
index efa54454de71..95d4e3860501 100644
--- a/media-sound/gpodder/metadata.xml
+++ b/media-sound/gpodder/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>hanno@gentoo.org</email></maintainer>
+  <herd>sound</herd>
+  <use>
+    <flag name='webkit'>Enable the webkit rendering engine for HTML episode shownotes</flag>
+  </use>
 </pkgmetadata>