Missing x11-proto/inputproto dep wrt #228233.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

4 files changed, 16 insertions, 104 deletions

diff --git a/x11-misc/xnee/ChangeLog b/x11-misc/xnee/ChangeLog
index 70b4cc48772a..23e824781e66 100644
--- a/x11-misc/xnee/ChangeLog
+++ b/x11-misc/xnee/ChangeLog
@@ -1,22 +1,26 @@
 # ChangeLog for x11-misc/xnee
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/ChangeLog,v 1.4 2008/02/29 20:47:44 carlo Exp $
+# 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 $
+
+  02 May 2009; Samuli Suominen <ssuominen@gentoo.org> -xnee-3.01.ebuild,
+  -files/xnee-3.01-destdir.patch, xnee-3.02.ebuild:
+  Missing x11-proto/inputproto dep wrt #228233.
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> xnee-3.01.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
 
 *xnee-3.02 (03 Feb 2008)
 
-  03 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  03 Feb 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/xnee-3.02-destdir.patch, +xnee-3.02.ebuild:
   Version bump with keyword for ~amd64.
 
-  14 Aug 2007; Samuli Suominen <drac@gentoo.org> xnee-3.01.ebuild:
+  14 Aug 2007; Samuli Suominen <ssuominen@gentoo.org> xnee-3.01.ebuild:
   Add desktop entry with icon.
 
 *xnee-3.01 (13 Aug 2007)
 
-  13 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  13 Aug 2007; Samuli Suominen <ssuominen@gentoo.org>
   +files/xnee-3.01-destdir.patch, +xnee-3.01.ebuild:
   Initial commit for bug 87725. Thanks to Philipp Serr and Florian Steinel.
 
diff --git a/x11-misc/xnee/files/xnee-3.01-destdir.patch b/x11-misc/xnee/files/xnee-3.01-destdir.patch
deleted file mode 100644
index 343cdc8a2692..000000000000
--- a/x11-misc/xnee/files/xnee-3.01-destdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur Xnee-3.01.orig/pnee/Makefile.in Xnee-3.01/pnee/Makefile.in
---- Xnee-3.01.orig/pnee/Makefile.in	2007-07-04 16:41:27.000000000 +0300
-+++ Xnee-3.01/pnee/Makefile.in	2007-08-13 20:18:15.000000000 +0300
-@@ -508,8 +508,8 @@
- 
- install-data-local: pnee.server
- 	@$(NORMAL_INSTALL)
--	mkdir -p $(PANEL_SERVER_DIR)
--	cp pnee.server   $(PANEL_SERVER_DIR)/
-+	mkdir -p $(DESTDIR)$(PANEL_SERVER_DIR)
-+	cp pnee.server $(DESTDIR)$(PANEL_SERVER_DIR)/
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -ur Xnee-3.01.orig/pnee/src/Makefile.in Xnee-3.01/pnee/src/Makefile.in
---- Xnee-3.01.orig/pnee/src/Makefile.in	2007-07-04 16:41:27.000000000 +0300
-+++ Xnee-3.01/pnee/src/Makefile.in	2007-08-13 20:14:18.000000000 +0300
-@@ -513,8 +513,8 @@
- 
- 
- install-exec-local: $(PNEE)	
--	mkdir -p $(PANEL_APPLET_DIR)
--	cp $(PNEE)  $(PANEL_APPLET_DIR)
-+	mkdir -p $(DESTDIR)$(PANEL_APPLET_DIR)
-+	cp $(PNEE) $(DESTDIR)$(PANEL_APPLET_DIR)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/x11-misc/xnee/xnee-3.01.ebuild b/x11-misc/xnee/xnee-3.01.ebuild
deleted file mode 100644
index cfb13328b6c0..000000000000
--- a/x11-misc/xnee/xnee-3.01.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.01.ebuild,v 1.3 2008/02/29 20:47:44 carlo Exp $
-
-inherit eutils
-
-MY_P=${P/x/X}
-
-DESCRIPTION="Program suite to record, replay and distribute user actions."
-HOMEPAGE="http://www.sandklef.com/xnee"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gnome gtk xosd"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst
-	gtk? ( >=x11-libs/gtk+-2 )
-	gnome? ( gnome-base/gconf
-		gnome-base/gnome-panel )"
-DEPEND="sys-apps/sed
-	dev-util/pkgconfig
-	gtk? ( sys-devel/gettext media-gfx/imagemagick )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-destdir.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use xosd; then
-		myconf="--enable-xosd --enable-verbose --enable-buffer_verbose"
-	else
-		myconf="--disable-xosd --disable-verbose --disable-buffer_verbose"
-	fi
-
-	econf --enable-cli --enable-lib \
-		$(use_enable gnome gnome-applet) \
-		$(use_enable gtk gui) \
-		${myconf}
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO
-
-	dolib libxnee/src/libxnee*
-
-	if use gtk; then
-		doicon pixmap/xnee.png
-		make_desktop_entry gnee Gnee xnee "Utility;GTK"
-	fi
-}
diff --git a/x11-misc/xnee/xnee-3.02.ebuild b/x11-misc/xnee/xnee-3.02.ebuild
index 2bd9d1aa0f73..a36dea1177ab 100644
--- a/x11-misc/xnee/xnee-3.02.ebuild
+++ b/x11-misc/xnee/xnee-3.02.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/02/03 18:12:53 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xnee/xnee-3.02.ebuild,v 1.3 2009/05/02 09:42:00 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Program suite to record, replay and distribute user actions."
@@ -19,16 +20,15 @@ RDEPEND="x11-libs/libX11
 	gnome? ( gnome-base/gconf
 		gnome-base/gnome-panel )"
 DEPEND="${RDEPEND}
+	x11-proto/inputproto
 	dev-util/pkgconfig
 	gtk? ( sys-devel/gettext media-gfx/imagemagick )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-destdir.patch
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	if use xosd; then
@@ -40,12 +40,10 @@ src_compile() {
 	econf ${myconf} --enable-cli --enable-lib \
 		$(use_enable gnome gnome-applet) \
 		$(use_enable gtk gui)
-
-	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO
 
 	if use gtk; then