Change license to x2x (bug #449944).

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 9 insertions, 114 deletions

diff --git a/x11-misc/x2x/ChangeLog b/x11-misc/x2x/ChangeLog
index b993bb99af8a..65d6fb3f21b3 100644
--- a/x11-misc/x2x/ChangeLog
+++ b/x11-misc/x2x/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/x2x
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.28 2012/02/05 17:54:37 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.29 2013/01/03 09:02:52 jer Exp $
+
+  03 Jan 2013; Jeroen Roovers <jer@gentoo.org> -x2x-1.27-r1.ebuild,
+  -x2x-1.27-r2.ebuild, x2x-1.27-r3.ebuild:
+  Change license to x2x (bug #449944).
 
   05 Feb 2012; Raúl Porcel <armin76@gentoo.org> x2x-1.27-r1.ebuild,
   x2x-1.27-r2.ebuild, x2x-1.27-r3.ebuild:
diff --git a/x11-misc/x2x/x2x-1.27-r1.ebuild b/x11-misc/x2x/x2x-1.27-r1.ebuild
deleted file mode 100644
index 1f27a2811e50..000000000000
--- a/x11-misc/x2x/x2x-1.27-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 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.13 2012/02/05 17:54:37 armin76 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://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="~amd64 ~mips ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	app-text/rman
-	x11-misc/imake
-	x11-proto/xproto"
-
-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
-}
diff --git a/x11-misc/x2x/x2x-1.27-r2.ebuild b/x11-misc/x2x/x2x-1.27-r2.ebuild
deleted file mode 100644
index 36e5994f6ad9..000000000000
--- a/x11-misc/x2x/x2x-1.27-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 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.7 2012/02/05 17:54:37 armin76 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://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
-	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
-	mirror://gentoo/${P}-license.patch.gz
-	mirror://gentoo/${P}-keymap.diff.gz"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	app-text/rman
-	x11-misc/imake
-	x11-proto/xproto"
-
-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}"/${P}-license.patch.gz
-
-	# Patch to fix bug #126939
-	# AltGr does not work in x2x with different keymaps:
-	epatch "${DISTDIR}"/${P}-keymap.diff.gz
-
-	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
-	mv x2x.1 x2x.man
-}
-
-src_compile() {
-	xmkmf || die "xmkmf failed."
-	emake || die "emake failed."
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "emake install failed."
-	newman x2x.man x2x.1
-}
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
index 7ee732f780a1..3a798289c795 100644
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r3.ebuild,v 1.6 2012/02/05 17:54:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r3.ebuild,v 1.7 2013/01/03 09:02:52 jer Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="An utility to connect the Mouse and KeyBoard to another X"
 HOMEPAGE="http://www.the-labs.com/X11/#x2x"
-LICENSE="as-is"
+LICENSE="x2x"
 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