Version bump.

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

3 files changed, 27 insertions, 37 deletions

diff --git a/x11-misc/xnee/ChangeLog b/x11-misc/xnee/ChangeLog
index 23e824781e66..5ab55d9e481b 100644
--- a/x11-misc/xnee/ChangeLog
+++ b/x11-misc/xnee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xnee
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/ChangeLog,v 1.5 2009/05/02 09:42:00 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/ChangeLog,v 1.6 2010/02/09 18:16:40 ssuominen Exp $
+
+*xnee-3.05 (09 Feb 2010)
+
+  09 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> +xnee-3.05.ebuild:
+  Version bump wrt #300539, thanks to Jeroen Roovers for reporting.
 
   02 May 2009; Samuli Suominen <ssuominen@gentoo.org> -xnee-3.01.ebuild,
   -files/xnee-3.01-destdir.patch, xnee-3.02.ebuild:
diff --git a/x11-misc/xnee/files/xnee-3.02-destdir.patch b/x11-misc/xnee/files/xnee-3.02-destdir.patch
deleted file mode 100644
index 7c1cb3bf3c60..000000000000
--- a/x11-misc/xnee/files/xnee-3.02-destdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur xnee-3.02.orig/doc/Makefile.in xnee-3.02/doc/Makefile.in
---- xnee-3.02.orig/doc/Makefile.in	2007-10-30 10:56:57.000000000 +0200
-+++ xnee-3.02/doc/Makefile.in	2008-02-03 19:48:14.000000000 +0200
-@@ -623,8 +623,8 @@
- ${IMG_JPG}: ${IMG_EPS}
- 
- install: 
--	mkdir -p $(docdir)
--	cp $(MANUALS) $(GEN_IMAGES_TO_INSTALL)  $(docdir)/
-+	mkdir -p $(DESTDIR)$(docdir)
-+	cp $(MANUALS) $(GEN_IMAGES_TO_INSTALL) $(DESTDIR)$(docdir)/
- 
- api-doc: xnee.dox 
- 	\rm -fr alldocs/
diff --git a/x11-misc/xnee/xnee-3.02.ebuild b/x11-misc/xnee/xnee-3.05.ebuild
index a36dea1177ab..73acf0d49098 100644
--- a/x11-misc/xnee/xnee-3.02.ebuild
+++ b/x11-misc/xnee/xnee-3.05.ebuild
@@ -1,35 +1,33 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.02.ebuild,v 1.3 2009/05/02 09:42:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.05.ebuild,v 1.1 2010/02/09 18:16:40 ssuominen Exp $
 
 EAPI=2
 inherit eutils
 
 DESCRIPTION="Program suite to record, replay and distribute user actions."
-HOMEPAGE="http://www.sandklef.com/xnee"
+HOMEPAGE="http://www.sandklef.com/xnee/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome gtk xosd"
+IUSE="gnome xosd"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXtst
-	gtk? ( >=x11-libs/gtk+-2 )
-	gnome? ( gnome-base/gconf
-		gnome-base/gnome-panel )"
+	gnome? ( x11-libs/gtk+:2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/gconf-2
+		>=gnome-base/gnome-panel-2 )"
 DEPEND="${RDEPEND}
 	x11-proto/inputproto
 	dev-util/pkgconfig
-	gtk? ( sys-devel/gettext media-gfx/imagemagick )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
-}
+	gnome? ( sys-devel/gettext
+		media-gfx/imagemagick )"
 
 src_configure() {
-	local myconf
+	local myconf=""
 
 	if use xosd; then
 		myconf="--enable-xosd --enable-verbose --enable-buffer_verbose"
@@ -37,17 +35,18 @@ src_configure() {
 		myconf="--disable-xosd --disable-verbose --disable-buffer_verbose"
 	fi
 
-	econf ${myconf} --enable-cli --enable-lib \
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable gnome gui) \
 		$(use_enable gnome gnome-applet) \
-		$(use_enable gtk gui)
+		--enable-cli \
+		--enable-lib \
+		--disable-static-programs \
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO
-
-	if use gtk; then
-		doicon pixmap/${PN}.png
-		make_desktop_entry gnee Gnee ${PN} "Utility;GTK"
-	fi
+	use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK"
 }