Change license to x2x (bug #449944).

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 22 insertions, 129 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/Manifest b/x11-misc/x2x/Manifest
index 3ee41588c2d5..898e903a10e7 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST x2x-1.27-keymap.diff.gz 1145 RMD160 661ab187b1c947a7f2aa3a9c6ae02a34ee6eeb13 SHA1 3dc71cc573dfe1c308e70796ce2173b12968e49e SHA256 7a18a9729868325b133fc62f5aaf759db9ebf20192e2d6d16b0dcf32927c7dc1
-DIST x2x-1.27-license.patch.gz 1001 RMD160 3ef946a86975e1ccb594968f70614197abd85a33 SHA1 5482e1b5515f92eb9adf66ec5591bca58b9b1baf SHA256 1b78a9de556622c72fd66bbf23245cd62cefe3c4e5ba37971f37c43eab2c9964
-DIST x2x-1.27.tar.gz 16776 RMD160 d26dad258aa785d1257f5d0fb6d4b45a322b5693 SHA1 ff817f2c9ce5b99f1d1cbb58efcc2c5e8bdbe94f SHA256 d27ffc37d801934e79a91aa8f413d9d6466297995bf7c88156842d1aec040a36
-DIST x2x_1.27-8-initvars.patch.gz 494 RMD160 33c15b42d387298b6d32f19203d9cc8a94989a39 SHA1 66db3662a0568664423ff88e582b716c3a7025a5 SHA256 b34173edeae1a5dd06ead2f9712ac4f28018b2723921054286d851366cdf9920
-DIST x2x_1.27-8.diff.gz 13291 RMD160 a3832676ad8a7858dfc65fbb398cd7b4b038140f SHA1 e44ec25636479f91759c6671dc7079ee67bf5e0f SHA256 d20fcc3e81ef60ef4720737883642739bb744a1d690c74b33d9086118e8b10ab
-EBUILD x2x-1.27-r1.ebuild 1319 RMD160 0ae460817efc3944202f96edc06e55c4bb5ff3b7 SHA1 4ce36cb810a67765e7837a75dabe99237be9730e SHA256 815c5b4c7731096bcc5ece2a8d9b4e461249584a7db64ac15689ac6b5424e5d9
-EBUILD x2x-1.27-r2.ebuild 1513 RMD160 dea0e3a6ffb7779512cf9f84fa822195006ac713 SHA1 01c64d8f925b669bc835d793e319d629ac7be7a4 SHA256 3f19f0f3decdbbc80128a248f167bc47d0eb7732286894d49e970fa5c9c21804
-EBUILD x2x-1.27-r3.ebuild 1657 RMD160 f6bc95a1ebc215e2a9546f0704de0b875ea28c05 SHA1 b01baa400134f9dd5195da13a979ac9a90758ed0 SHA256 530cec23e1147f4dd1075eb8e668c548bef90d063e7d1addc13e55a93e70ecf2
-MISC ChangeLog 3678 RMD160 ee8851d6017688a59b57d062dcaed11b33ab604a SHA1 ea86b7fe029c443a28da91c95495afbe09b68f44 SHA256 faf52fd6a23257692c6c01ab91aad5bc268e068b8d30d24ff7e9a9643de47e94
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+DIST x2x-1.27-keymap.diff.gz 1145 SHA256 7a18a9729868325b133fc62f5aaf759db9ebf20192e2d6d16b0dcf32927c7dc1 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f WHIRLPOOL cec4095420fc46b9a19498aa4bc767605b451ab48369e4a7171ffc7cae3c76ba38bedaaecf9e67500ffff5f7becafde19afde9955b25288e6b4f00204c85a153
+DIST x2x-1.27-license.patch.gz 1001 SHA256 1b78a9de556622c72fd66bbf23245cd62cefe3c4e5ba37971f37c43eab2c9964 SHA512 cdff296ed3ea7d3d72b7d64f4878d94b63ee459a3487668b2174f54e4d2519daa1fb80ffec2cb3ce188032bb72148629cb276eb0d0311ed1f26c3da8066caed8 WHIRLPOOL c1945777befe38bbcc7c70ae89665337d8043d467d249bd5f1b707d1ab20b58766b54280bcd6ce53c3ab30b9473ab4f42fd92fce3799de25705b5149d371eba1
+DIST x2x-1.27.tar.gz 16776 SHA256 d27ffc37d801934e79a91aa8f413d9d6466297995bf7c88156842d1aec040a36 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131 WHIRLPOOL 6900c30e8c937380812668048c01429a0e7af532042791cecdb5c877b191d146cac3fafc8c47beebea96bcfc983abbe4b03414f85b768c5bc40169e148344028
+DIST x2x_1.27-8-initvars.patch.gz 494 SHA256 b34173edeae1a5dd06ead2f9712ac4f28018b2723921054286d851366cdf9920 SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01 WHIRLPOOL 369a6af91841fc50435c74bda8f0a76b99669bcd0a1642990746755874c26c2cf7477502f4017c84c6485f3352854985b19634ed06ce7db641307c2a13c18572
+DIST x2x_1.27-8.diff.gz 13291 SHA256 d20fcc3e81ef60ef4720737883642739bb744a1d690c74b33d9086118e8b10ab SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71 WHIRLPOOL de2e1a36f733dba3050ec22b42d2c394e4e64a16a78dc650fd88839fab3d71f7ab7db202af075bb35f662b41d44561dfb73931d9be86b5374d6ebc9987aca852
+EBUILD x2x-1.27-r3.ebuild 1651 SHA256 b9096a076342f0b201a10a9238a7b6b85fb671f5baf1ea59f788085aa4de2853 SHA512 35c8e3bc08eb2258ed266cd0c4118eb14ecd500e89c49249638c18a9f5a1e9e142a87b88b8b02fc0ee647204b28b47a17af6d43b2edecc02442e9069883ab6a0 WHIRLPOOL befacb7372516fc6d9948faa6b54929cb7644ae313b3d9b1b4a7b61d16419b088affbb8ca0e45edef8830189507810916be9ebf9c4e8960f78b9721cda4c8362
+MISC ChangeLog 3825 SHA256 2830c8db05a07b4fdafd9ad52ef80fd09f7fbc5490566e7be15d2bef08757dc2 SHA512 8913327ae92d7c64cb27ed0d22f796cca8546a6ec3e71e4cc1f7bbdebe5c8eb76393e50fcfa05589d184d0b07929f710542e02352cf2188c6b3cb665c4c1f74a WHIRLPOOL 5dcb20e46541f218431a1c01d485f0e49cf07c4c2247a346e9d17536ae2e6f61695befe1e86a1a7e8d1067a77a843986195fa8e6b7fa09fccbf7016214a8d546
+MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk8uwmMACgkQuQc30/atMkBDOQCfZlVVvKJSCC9YPnK5M8qiE+Id
-z1EAoKt9zP5BVIyzrsil7AwpjqyLXFqs
-=S1Ak
+iEYEAREIAAYFAlDlST0ACgkQVWmRsqeSphMHKACeN4TKUirp2NxP9YzSDhutK44w
+3CwAn31XCX5/UAbAx67h+HRhb8QfzlkW
+=b7d0
 -----END PGP SIGNATURE-----
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