gnome-extra/timer-applet: Version bump for bug 131669, python usage changed

svn path=/sunrise/; revision=10427

5 files changed, 56 insertions, 49 deletions

diff --git a/gnome-extra/timer-applet/ChangeLog b/gnome-extra/timer-applet/ChangeLog
index b5744bd8e..23308ce21 100644
--- a/gnome-extra/timer-applet/ChangeLog
+++ b/gnome-extra/timer-applet/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for gnome-extra/timer-applet
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Apr 2010; Michael Weber (xmw) <gentoo@xmw.de>
+  -timer-applet-2.0.1.ebuild, +timer-applet-2.1.2.ebuild, metadata.xml:
+  Version bump for bug 131669, python usage changed
+
   23 Aug 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de> metadata.xml:
   Added USE flag description wrt GLEP 56
 
diff --git a/gnome-extra/timer-applet/Manifest b/gnome-extra/timer-applet/Manifest
index 823b797e3..a9207571f 100644
--- a/gnome-extra/timer-applet/Manifest
+++ b/gnome-extra/timer-applet/Manifest
@@ -1,4 +1,4 @@
-DIST timer-applet-2.0.1.tar.gz 213044 RMD160 500f54a8fcd580148abcd4f9c2261e4a34771eb1 SHA1 220d3e473ed41ecbfa8364a791adb3af6bbd3a98 SHA256 bee206b0bbc73d0751793c8a79e5bb234285013dee12573c11f3131898785ac2
-EBUILD timer-applet-2.0.1.ebuild 1014 RMD160 d86030ba149fdfb8f20e227b09b66f513cdcf9cf SHA1 fdc652212c07051f28227d19ca4217ffa4ca45ba SHA256 66660be7d8ff0c6dd33d5b6613a01861bdffea9f338c9ae6614caa679beb7b00
-MISC ChangeLog 1210 RMD160 3559fbf33ed47f958fae052e16e785bbddeb4210 SHA1 862769eb5e8ad56723a2fb3bdba9c20623c864ce SHA256 8194871a246e22f3f6a41645534c1683bad4feb21ec871bee8844e550174c6ed
-MISC metadata.xml 244 RMD160 15aa47095f5af167505368fe5a3d36c5a3792267 SHA1 dfc27f2f3db1f25cba6c34f15c35770603cc2330 SHA256 5ed912f9f385ffd317fca88215a677a94e0896749035005801d4eff172097035
+DIST timer-applet-2.1.2.tar.gz 203617 RMD160 627d351a0d9b8b6a52182122e77db88cb2d267fb SHA1 4029abc4f0d3282b7a9e5c8930551b5b6ae9bc25 SHA256 e0689342fa14a24c940534b6bd7d52849fd71a4274b21270c7611d60eb852d8a
+EBUILD timer-applet-2.1.2.ebuild 948 RMD160 456401ad80ed75deace4b24a6d5c202a0453764f SHA1 7f9a2502e6361b9d802c42b807977d88cd69e94c SHA256 43f9a0f67d2bd80ff68e6e9dfb48f4c4d81a35a89c9701de1bb57aa010419787
+MISC ChangeLog 1386 RMD160 90cddf48bfa5514f9d7f07b22d7147c98229d953 SHA1 9ed900a13301beecdbcbd28baa62354fea891685 SHA256 af8ba4741464f4678c559cb3ca27d8c6b7896b2230cfe412e15f2cbba6076a5d
+MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
diff --git a/gnome-extra/timer-applet/metadata.xml b/gnome-extra/timer-applet/metadata.xml
index d479acdb6..6f1d493c5 100644
--- a/gnome-extra/timer-applet/metadata.xml
+++ b/gnome-extra/timer-applet/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>maintainer-wanted</herd>
-	<use>
-		<flag name='sounds'>Installs optional sound data</flag>
-	</use>
 </pkgmetadata>
diff --git a/gnome-extra/timer-applet/timer-applet-2.0.1.ebuild b/gnome-extra/timer-applet/timer-applet-2.0.1.ebuild
deleted file mode 100644
index fdc3bc385..000000000
--- a/gnome-extra/timer-applet/timer-applet-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-
-inherit gnome2 python multilib
-
-DESCRIPTION="A countdown timer applet for the GNOME panel"
-HOMEPAGE="http://timerapplet.sourceforge.net"
-SRC_URI="mirror://sourceforge/timerapplet/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc sounds libnotify"
-
-DEPEND="|| ( ( virtual/python:2.4 dev-python/elementtree )
-		virtual/python:2.5 )
-	>=dev-python/pygtk-2.10
-	>=dev-python/gnome-python-2.16
-	>=dev-python/gnome-python-desktop-2.16
-	>=dev-python/notify-python-0.1
-	>=dev-python/dbus-python-0.8"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS Changelog NEWS README"
-
-src_unpack() {
-	gnome2_src_unpack
-	ln -sf $(type -P true) "${S}/py-compile"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/timerapplet"
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/timerapplet"
-}
diff --git a/gnome-extra/timer-applet/timer-applet-2.1.2.ebuild b/gnome-extra/timer-applet/timer-applet-2.1.2.ebuild
new file mode 100644
index 000000000..b13e71f2b
--- /dev/null
+++ b/gnome-extra/timer-applet/timer-applet-2.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit autotools gnome2 python
+
+DESCRIPTION="A countdown timer applet for the GNOME Panel"
+HOMEPAGE="http://timerapplet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/timerapplet/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	|| (
+		( dev-lang/python:2.4 dev-python/elementtree )
+		dev-lang/python:2.5
+		dev-lang/python:2.6
+	)
+	dev-python/pygtk
+	dev-python/gnome-python
+	dev-python/gnome-python-desktop
+	dev-python/notify-python
+	dev-python/dbus-python"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	gnome-base/gconf"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	eautoreconf
+	ln -sf $(type -P true) "${S}/py-compile" || die
+}
+
+pkg_postinst() {
+	python_mod_optimize "$(python_get_sitedir)"/timerapplet
+}
+
+pkg_postrm() {
+	python_mod_cleanup "$(python_get_sitedir)"/timerapplet
+}