clean up, take maintainership

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

9 files changed, 28 insertions, 123 deletions

diff --git a/app-arch/unshield/files/unshield-0.5-amd64.patch b/app-arch/unshield/files/unshield-0.5-amd64.patch
index 70b71d05a82c..e9f59e7a0e14 100644
--- a/app-arch/unshield/files/unshield-0.5-amd64.patch
+++ b/app-arch/unshield/files/unshield-0.5-amd64.patch
@@ -1,6 +1,5 @@
-diff -u unshield-0.5.orig/lib/md5/global.h unshield-0.5/lib/md5/global.h
---- unshield-0.5.orig/lib/md5/global.h	2006-09-26 18:19:28.000000000 -0400
-+++ unshield-0.5/lib/md5/global.h	2006-09-26 18:17:04.000000000 -0400
+--- lib/md5/global.h
++++ lib/md5/global.h
 @@ -17,7 +17,7 @@
  typedef unsigned short int UINT2;
  
@@ -10,9 +9,8 @@ diff -u unshield-0.5.orig/lib/md5/global.h unshield-0.5/lib/md5/global.h
  
  /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
  If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-diff -u unshield-0.5.orig/lib/md5/md5c.c unshield-0.5/lib/md5/md5c.c
---- unshield-0.5.orig/lib/md5/md5c.c	2006-09-26 18:19:28.000000000 -0400
-+++ unshield-0.5/lib/md5/md5c.c	2006-09-26 18:18:11.000000000 -0400
+--- lib/md5/md5c.c
++++ lib/md5/md5c.c
 @@ -68,7 +68,7 @@
  
  /* ROTATE_LEFT rotates x left n bits.
diff --git a/app-arch/unshield/files/unshield-gcc-3.4.patch b/app-arch/unshield/files/unshield-gcc-3.4.patch
deleted file mode 100644
index 855cf461f5fd..000000000000
--- a/app-arch/unshield/files/unshield-gcc-3.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- unshield-0.4/src/unshield.c.old	2005-06-05 22:30:04.000000000 +0200
-+++ unshield-0.4/src/unshield.c	2005-06-05 22:29:04.000000000 +0200
-@@ -378,7 +378,7 @@
-       if (dirname[strlen(dirname)-1] != '/')
-         strcat(dirname, "/");
- 
--      printf(" %8i  %s%s\n",
-+      printf(" %8zi  %s%s\n",
-           unshield_file_size(unshield, i),
-           dirname,
-           unshield_file_name(unshield, i)); 
diff --git a/app-arch/unshield/metadata.xml b/app-arch/unshield/metadata.xml
index 228404d3a4b2..cd109a873f9d 100644
--- a/app-arch/unshield/metadata.xml
+++ b/app-arch/unshield/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
+  <herd>pda</herd>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-arch/unshield/unshield-0.2.ebuild b/app-arch/unshield/unshield-0.2.ebuild
deleted file mode 100644
index 1abb3dc9cbdb..000000000000
--- a/app-arch/unshield/unshield-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.2.ebuild,v 1.9 2006/07/13 20:48:48 liquidx Exp $
-
-DESCRIPTION="InstallShield CAB file extractor."
-HOMEPAGE="http://synce.sourceforge.net/synce/unshield.php"
-SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-arch/unshield/unshield-0.4.ebuild b/app-arch/unshield/unshield-0.4.ebuild
deleted file mode 100644
index 14ff5ef92914..000000000000
--- a/app-arch/unshield/unshield-0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.4.ebuild,v 1.9 2006/07/13 20:48:48 liquidx Exp $
-
-inherit eutils
-
-DESCRIPTION="InstallShield CAB file extractor."
-HOMEPAGE="http://synce.sourceforge.net/synce/unshield.php"
-SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/unshield-gcc-3.4.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-arch/unshield/unshield-0.5-r1.ebuild b/app-arch/unshield/unshield-0.5-r1.ebuild
index 616cb20b34a3..01e27f30bf46 100644
--- a/app-arch/unshield/unshield-0.5-r1.ebuild
+++ b/app-arch/unshield/unshield-0.5-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.5-r1.ebuild,v 1.3 2007/03/30 02:56:31 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.5-r1.ebuild,v 1.4 2011/02/27 10:13:09 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
-DESCRIPTION="InstallShield CAB file extractor."
-HOMEPAGE="http://synce.sourceforge.net/synce/unshield.php"
+DESCRIPTION="InstallShield CAB file extractor"
+HOMEPAGE="http://www.synce.org/"
 SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -13,15 +14,14 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE=""
 
-DEPEND=">=sys-libs/zlib-1.1.4"
+RDEPEND=">=sys-libs/zlib-1.1.4"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-amd64.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-amd64.patch
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc README
 }
diff --git a/app-arch/unshield/unshield-0.5.1.ebuild b/app-arch/unshield/unshield-0.5.1.ebuild
deleted file mode 100644
index 84177b076482..000000000000
--- a/app-arch/unshield/unshield-0.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.5.1.ebuild,v 1.1 2008/11/13 06:26:24 mescalinum Exp $
-
-inherit eutils
-
-DESCRIPTION="InstallShield CAB file extractor."
-HOMEPAGE="http://synce.sourceforge.net/synce/unshield.php"
-SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-arch/unshield/unshield-0.5.ebuild b/app-arch/unshield/unshield-0.5.ebuild
deleted file mode 100644
index 6fb9974259d1..000000000000
--- a/app-arch/unshield/unshield-0.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.5.ebuild,v 1.3 2006/09/18 16:51:31 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="InstallShield CAB file extractor."
-HOMEPAGE="http://synce.sourceforge.net/synce/unshield.php"
-SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-arch/unshield/unshield-0.6.ebuild b/app-arch/unshield/unshield-0.6.ebuild
index 14a1872a8b65..ff3e7f554d4c 100644
--- a/app-arch/unshield/unshield-0.6.ebuild
+++ b/app-arch/unshield/unshield-0.6.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.6.ebuild,v 1.1 2009/08/07 01:41:44 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.6.ebuild,v 1.2 2011/02/27 10:13:09 ssuominen Exp $
 
-DESCRIPTION="InstallShield CAB file extractor."
-HOMEPAGE="http://synce.sourceforge.net/synce/unshield.php"
+EAPI=2
+
+DESCRIPTION="InstallShield CAB file extractor"
+HOMEPAGE="http://www.synce.org/"
 SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -11,10 +13,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=sys-libs/zlib-1.1.4"
-RDEPEND="${DEPEND}"
+RDEPEND=">=sys-libs/zlib-1.1.4"
+DEPEND="${RDEPEND}"
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc README
 }