Missing x11-proto/inputproto dep wrt #228233.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

5 files changed, 18 insertions, 109 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/Manifest b/x11-misc/xnee/Manifest
index dcbb71defdb4..f16cfe674b17 100644
--- a/x11-misc/xnee/Manifest
+++ b/x11-misc/xnee/Manifest
@@ -1,8 +1,5 @@
-AUX xnee-3.01-destdir.patch 1163 RMD160 7eff4abf4fd83275b42c3d10bbe301dca8c9f0d6 SHA1 545d1bced3a6f520a64c1c6da2fa83b7038b59ce SHA256 56cc7b8d63e9029af705b74f3a3a586978e825e2351cca5e7a82b7d2ec21da9a
 AUX xnee-3.02-destdir.patch 468 RMD160 cee35b4450861097abe14eec7184d6aa285026f0 SHA1 3c567ebfa1c3f0883cc30af81fabb3cb69dab83c SHA256 65bb058a771d355964e8c9251cf50048c750b64f15f2c3d6bd7d08d733c670bb
-DIST Xnee-3.01.tar.gz 611686 RMD160 315570f462fa1aea331b4779bb44d9c457991875 SHA1 badf3e0f520716bbc0718dd4941368bbcc696c67 SHA256 018546681f22a4af6fbef512ebca3b67b2a090761699f39e00a1d72c61c0dcbc
 DIST xnee-3.02.tar.gz 1714690 RMD160 a29631c83ebabf5d566421eab2e613c464754ab5 SHA1 eb107c91fbcaf65cd5c7fba6a34988d81716e8a3 SHA256 fe348f343d1c380d0cf5e51b007dd891f81095beca670b50725ca0ccad12918e
-EBUILD xnee-3.01.ebuild 1390 RMD160 f5d3b5afcc914e640f9b8d39d4d7345d31c9c410 SHA1 b72a5c9bf3d8261b14e8eb6046b820c7954f6c46 SHA256 514381b4324f28391b9f825003403a57780a5face3def5944ef83435f8688a44
-EBUILD xnee-3.02.ebuild 1321 RMD160 02e5c9374b239a40f087894cc945d03db698767a SHA1 22b45848de4d823b731109ddf95a1236e1ac2224 SHA256 df4085264093bb87b9923f81106cc4e04e811851322e42e9d97d34580cb07c76
-MISC ChangeLog 817 RMD160 6d49f4bced1e8c6dad7aa8258e4b35c6522aabd0 SHA1 9ebdc1dc350a363e8fbd9fa352699c5dc8d7d31c SHA256 ee69d8b2aab901c50aed0fe61c406b0d1ae068b80fc4419ce39c9adc557c3503
+EBUILD xnee-3.02.ebuild 1302 RMD160 34cf9ae398a049e0c0e90313c2808b20a0250db1 SHA1 d853d18b3e248a84286dc896f0081f27c1bdb7b4 SHA256 9a484744e4e8f622e55768f0ef41c67c6caf7081020690d77d6f8dd449cbbc32
+MISC ChangeLog 1010 RMD160 324b834c765c8af9c3e20afba01244e56c14e048 SHA1 7384b39532a50e86b83fbf7565b74b68f91f6239 SHA256 c4310dfd629ecaeaf9a95051a13d21d681861620c1b09b20c75d39b2e5d4638c
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
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