Add missing x11-proto/inputproto to DEPEND (bug #204588), remove unneeded version.

(Portage version: 2.1.4_rc14)

5 files changed, 13 insertions, 56 deletions

diff --git a/x11-misc/x2x/ChangeLog b/x11-misc/x2x/ChangeLog
index c5f6ca2ea8a6..2cae10acc937 100644
--- a/x11-misc/x2x/ChangeLog
+++ b/x11-misc/x2x/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/x2x
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.20 2007/11/15 17:15:23 drac Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.21 2008/01/07 10:45:40 nelchael Exp $
+
+  07 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org> -x2x-1.27.ebuild,
+  x2x-1.27-r1.ebuild, x2x-1.27-r2.ebuild:
+  Add missing x11-proto/inputproto to DEPEND (bug #204588), remove unneeded
+  version.
 
   15 Nov 2007; Samuli Suominen <drac@gentoo.org> x2x-1.27-r2.ebuild:
   amd64 stable, QA clean up.
diff --git a/x11-misc/x2x/files/digest-x2x-1.27 b/x11-misc/x2x/files/digest-x2x-1.27
deleted file mode 100644
index a56e6fae2ed5..000000000000
--- a/x11-misc/x2x/files/digest-x2x-1.27
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31458c78fb5ded7e92a3cccb39b77143 x2x-1.27-license.patch.gz 1001
-RMD160 3ef946a86975e1ccb594968f70614197abd85a33 x2x-1.27-license.patch.gz 1001
-SHA256 1b78a9de556622c72fd66bbf23245cd62cefe3c4e5ba37971f37c43eab2c9964 x2x-1.27-license.patch.gz 1001
-MD5 3d1bc863f3209ec37caf7f57bde7e8f0 x2x-1.27.tar.gz 16776
-RMD160 d26dad258aa785d1257f5d0fb6d4b45a322b5693 x2x-1.27.tar.gz 16776
-SHA256 d27ffc37d801934e79a91aa8f413d9d6466297995bf7c88156842d1aec040a36 x2x-1.27.tar.gz 16776
diff --git a/x11-misc/x2x/x2x-1.27-r1.ebuild b/x11-misc/x2x/x2x-1.27-r1.ebuild
index f71bf622e4c1..2042dc09080f 100644
--- a/x11-misc/x2x/x2x-1.27-r1.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r1.ebuild,v 1.9 2007/07/22 03:33:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r1.ebuild,v 1.10 2008/01/07 10:45:40 nelchael Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
+	x11-proto/inputproto
 	app-text/rman
 	x11-misc/imake
 	x11-proto/xproto"
diff --git a/x11-misc/x2x/x2x-1.27-r2.ebuild b/x11-misc/x2x/x2x-1.27-r2.ebuild
index 6f0bd927695f..5fe610e734c0 100644
--- a/x11-misc/x2x/x2x-1.27-r2.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r2.ebuild,v 1.3 2007/11/15 17:15:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r2.ebuild,v 1.4 2008/01/07 10:45:40 nelchael Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
+	x11-proto/inputproto
 	app-text/rman
 	x11-misc/imake
 	x11-proto/xproto"
diff --git a/x11-misc/x2x/x2x-1.27.ebuild b/x11-misc/x2x/x2x-1.27.ebuild
deleted file mode 100644
index b7813a32a4a5..000000000000
--- a/x11-misc/x2x/x2x-1.27.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27.ebuild,v 1.15 2007/07/22 03:33:36 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="An utility to connect the Mouse and KeyBoard to another X"
-HOMEPAGE="http://www.the-labs.com/X11/#x2x"
-LICENSE="as-is"
-SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
-	mirror://gentoo/x2x-1.27-license.patch.gz"
-SLOT="0"
-KEYWORDS="x86 sparc alpha amd64 ~mips"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Patch to add LICENSE
-	epatch ${DISTDIR}/x2x-1.27-license.patch.gz
-
-	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
-	mv x2x.1 x2x.man || die
-}
-
-src_compile() {
-	xmkmf || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	newman x2x.man x2x.1 || die
-	dodoc LICENSE || die
-}