Add Debian patches for -north/-south #57301. Move license patch to distfiles

and clean up ebuilds
(Portage version: 2.0.51.19)

7 files changed, 78 insertions, 13 deletions

diff --git a/x11-misc/x2x/ChangeLog b/x11-misc/x2x/ChangeLog
index 81c347291249..613a8e943c0d 100644
--- a/x11-misc/x2x/ChangeLog
+++ b/x11-misc/x2x/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/x2x
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.10 2004/06/24 22:36:58 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.11 2005/04/19 19:30:08 agriffis Exp $
+
+*x2x-1.27-r1 (19 Apr 2005)
+
+  19 Apr 2005; Aron Griffis <agriffis@gentoo.org> -files/x2x-1.27.diff.gz,
+  x2x-1.27.ebuild, +x2x-1.27-r1.ebuild:
+  Add Debian patches for -north/-south #57301. Move license patch to distfiles
+  and clean up ebuilds
 
   01 Jun 2004; Brandon Hale <tseng@gentoo.org> x2x-1.27.ebuild:
   Ebuild QA fixes.
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index a67f51ba358b..c6f07529332c 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -1,5 +1,6 @@
-MD5 4266ce0f1a5342b5834c6e6ceb153bb2 x2x-1.27.ebuild 738
 MD5 f50cb0377815f2a0e098d637c07ec0a9 ChangeLog 1189
+MD5 a5bff333696f5233a87dbe905985ea0b x2x-1.27-r1.ebuild 1207
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 2a3ef5a3de38c47d4d01b122294eb40f files/x2x-1.27.diff.gz 1008
-MD5 eba604620e6b00095f04ea014274d988 files/digest-x2x-1.27 59
+MD5 cc95496fc1e976754e228ea20c78aea7 x2x-1.27.ebuild 905
+MD5 01ab50adb860c966822f21ead4e230ab files/digest-x2x-1.27 127
+MD5 b5a6a3d1860be9a5feee96a538f9d5cb files/digest-x2x-1.27-r1 259
diff --git a/x11-misc/x2x/files/digest-x2x-1.27 b/x11-misc/x2x/files/digest-x2x-1.27
index c09fe86c1c10..991e9770d761 100644
--- a/x11-misc/x2x/files/digest-x2x-1.27
+++ b/x11-misc/x2x/files/digest-x2x-1.27
@@ -1 +1,2 @@
 MD5 3d1bc863f3209ec37caf7f57bde7e8f0 x2x-1.27.tar.gz 16776
+MD5 31458c78fb5ded7e92a3cccb39b77143 x2x-1.27-license.patch.gz 1001
diff --git a/x11-misc/x2x/files/digest-x2x-1.27-r1 b/x11-misc/x2x/files/digest-x2x-1.27-r1
new file mode 100644
index 000000000000..5c81d0ebe759
--- /dev/null
+++ b/x11-misc/x2x/files/digest-x2x-1.27-r1
@@ -0,0 +1,4 @@
+MD5 3d1bc863f3209ec37caf7f57bde7e8f0 x2x-1.27.tar.gz 16776
+MD5 8b194387b2712fb9c1b02c166e8e47c6 x2x_1.27-8.diff.gz 13291
+MD5 041153ed2bb2dd807c9b7ee7c533bd00 x2x_1.27-8-initvars.patch.gz 494
+MD5 31458c78fb5ded7e92a3cccb39b77143 x2x-1.27-license.patch.gz 1001
diff --git a/x11-misc/x2x/files/x2x-1.27.diff.gz b/x11-misc/x2x/files/x2x-1.27.diff.gz
deleted file mode 100644
index 1e06c9771654..000000000000
--- a/x11-misc/x2x/files/x2x-1.27.diff.gz
+++ /dev/null
diff --git a/x11-misc/x2x/x2x-1.27-r1.ebuild b/x11-misc/x2x/x2x-1.27-r1.ebuild
new file mode 100644
index 000000000000..811b2769818b
--- /dev/null
+++ b/x11-misc/x2x/x2x-1.27-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 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.1 2005/04/19 19:30:08 agriffis 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"
+DEPEND="virtual/x11"
+SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
+	mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
+	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
+	mirror://gentoo/x2x-1.27-license.patch.gz"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch from Debian to add -north and -south, among other fixes
+	epatch ${DISTDIR}/x2x_1.27-8.diff.gz
+
+	# Fix variable initialization in Debian patch
+	epatch ${DISTDIR}/x2x_1.27-8-initvars.patch.gz
+
+	# 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
+}
diff --git a/x11-misc/x2x/x2x-1.27.ebuild b/x11-misc/x2x/x2x-1.27.ebuild
index 69e8e38389e9..314f4ebbad25 100644
--- a/x11-misc/x2x/x2x-1.27.ebuild
+++ b/x11-misc/x2x/x2x-1.27.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.10 2004/06/24 22:36:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27.ebuild,v 1.11 2005/04/19 19:30:08 agriffis 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"
 DEPEND="virtual/x11"
-SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz"
+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=""
@@ -14,17 +17,21 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	gunzip < ${FILESDIR}/${P}.diff.gz | patch || die "patch failed"
+
+	# 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
-	cp x2x.1 x2x.man
+	xmkmf || die
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-	doman x2x.1
-	dodoc ${S}/LICENSE
+	newman x2x.man x2x.1 || die
+	dodoc LICENSE || die
 }