Remove old. Add upstream metadata.

(Portage version: 2.1.11.2/cvs/Linux x86_64)

6 files changed, 12 insertions, 86 deletions

diff --git a/x11-misc/touchcal/ChangeLog b/x11-misc/touchcal/ChangeLog
index 55fcb512efe5..872b07db3a7e 100644
--- a/x11-misc/touchcal/ChangeLog
+++ b/x11-misc/touchcal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/touchcal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/ChangeLog,v 1.11 2012/06/17 07:18:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/ChangeLog,v 1.12 2012/06/27 16:11:47 kensington Exp $
+
+  27 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+  -files/touchcal-0.31-buff-overflow.patch, -touchcal-0.31-r1.ebuild,
+  -touchcal-0.31.ebuild, -touchcal-0.40.ebuild, metadata.xml:
+  Remove old. Add upstream metadata.
 
   17 Jun 2012; Jeff Horelick <jdhore@gentoo.org> touchcal-0.50.ebuild:
   marked x86 per bug 421227
@@ -46,4 +51,3 @@
   08 Nov 2006; Daniel Drake <dsd@gentoo.org> +metadata.xml,
   +touchcal-0.31.ebuild:
   Initial release
-
diff --git a/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch b/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch
deleted file mode 100644
index a9bea151f8e6..000000000000
--- a/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- touchcal.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/touchcal.c b/touchcal.c
-index 7341fd7..93b262c 100644
---- a/touchcal.c
-+++ b/touchcal.c
-@@ -138,8 +138,8 @@ static void init_mu(char dev[])
- 	set_page[3]='1';
- 	set_page[4]=0x0d;
- 
--	/*define data string*/
--	strcpy(data,"00180769001D0793");
-+    /* define data string */
-+    strncpy(data, "00180769001D0793", 16);
- 
- 	bzero(&newtio, sizeof(newtio)); /* clear struct for new port settings */
- 
diff --git a/x11-misc/touchcal/metadata.xml b/x11-misc/touchcal/metadata.xml
index a40624fba8f0..e4c3af14ebcb 100644
--- a/x11-misc/touchcal/metadata.xml
+++ b/x11-misc/touchcal/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">touchcal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/touchcal/touchcal-0.31-r1.ebuild b/x11-misc/touchcal/touchcal-0.31-r1.ebuild
deleted file mode 100644
index ed32b1f2f163..000000000000
--- a/x11-misc/touchcal/touchcal-0.31-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/touchcal-0.31-r1.ebuild,v 1.1 2011/04/14 06:56:52 jlec Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Touchscreen calibration utility"
-HOMEPAGE="http://touchcal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-buff-overflow.patch
-}
diff --git a/x11-misc/touchcal/touchcal-0.31.ebuild b/x11-misc/touchcal/touchcal-0.31.ebuild
deleted file mode 100644
index 6687eda67ed3..000000000000
--- a/x11-misc/touchcal/touchcal-0.31.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/touchcal-0.31.ebuild,v 1.6 2011/04/14 06:56:52 jlec Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Touchscreen calibration utility"
-HOMEPAGE="http://touchcal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-buff-overflow.patch
-}
diff --git a/x11-misc/touchcal/touchcal-0.40.ebuild b/x11-misc/touchcal/touchcal-0.40.ebuild
deleted file mode 100644
index 926843edc247..000000000000
--- a/x11-misc/touchcal/touchcal-0.40.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/touchcal-0.40.ebuild,v 1.1 2011/04/14 06:59:59 jlec Exp $
-
-EAPI="4"
-
-DESCRIPTION="Touchscreen calibration utility"
-HOMEPAGE="http://touchcal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"