Fix missing file, pkg-config and zlib depend. USE static-libs. punt old

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

6 files changed, 31 insertions, 102 deletions

diff --git a/app-pda/orange/ChangeLog b/app-pda/orange/ChangeLog
index 94068e1dc207..d34d188bc501 100644
--- a/app-pda/orange/ChangeLog
+++ b/app-pda/orange/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-pda/orange
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/orange/ChangeLog,v 1.15 2009/01/21 00:03:39 mescalinum Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/orange/ChangeLog,v 1.16 2010/11/04 20:03:59 ssuominen Exp $
+
+  04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> orange-0.4.ebuild:
+  Fix missing file, pkg-config and zlib depend. USE static-libs.
 
 *orange-0.4 (21 Jan 2009)
 
diff --git a/app-pda/orange/Manifest b/app-pda/orange/Manifest
index bfe1f37af053..ef31d8799efa 100644
--- a/app-pda/orange/Manifest
+++ b/app-pda/orange/Manifest
@@ -1,10 +1,4 @@
-DIST liborange-0.3.2.tar.gz 380034 RMD160 cd49587043e64f3ef961c1e514d6b76b35e548cc SHA1 b8656b3fd9c71f42f43a0baf21f881e8e25634c3 SHA256 5aed6ae32a2e103bd846c02a55b7d802fb1b6c2676207fba62d2a0ec944f57a1
 DIST liborange-0.4.tar.gz 330089 RMD160 e4595c59dd7eb8ac564b92f49695332a3ca2f1ba SHA1 70028d570b9ed9831303a36c6ff60e74a5c7f3c9 SHA256 023fc4ecdd4e775023b89d8fea37918ed8ba55012578e4f7ac0ec3cd1e843fbe
-DIST orange-0.2.tar.gz 214255 RMD160 31b88c1bb59f312b1c8284bfff9e9e6b88bd0450 SHA1 ed39e4b89fbc94aa18fbcd4d98eb32c9a7fcf44f SHA256 78833b243f5b806451a83cabd8829e53007d2bfc658576518d68b081004483af
-DIST orange-0.3.tar.gz 336931 RMD160 758cfa031b4bdb189dd14be5403f9b30d33bc4a3 SHA1 9352b36619560d01f1d246fe64c16ce543d9b2d1 SHA256 828cc7c7b7c21e0d8e5e3143b1428bbc1f4cfab7f9af934fe1b110fe7d333e41
-EBUILD orange-0.2-r1.ebuild 792 RMD160 6389f36c02df0d5d74306fc7a327699e8542ca21 SHA1 3e44a73c6deded29275e32e10912f855e427631b SHA256 a8d66e36691eae50bbd48fcbfb47cbcd00f5fee79379cf784dcb1d7f8695fa52
-EBUILD orange-0.3.2.ebuild 656 RMD160 68360c3426d83baca15a33703c7e08f721e94715 SHA1 89f24765e703bd1aa4fccbae2d9bf8ca7ad14d21 SHA256 087d589285d885e0a16573ac7712a170a9c40f4ce24a8b46a6c839c733f73498
-EBUILD orange-0.3.ebuild 738 RMD160 0c6932d86c1aa8bbff880212a61983caecd73aa0 SHA1 4238ede7ac7bb4d2337e4c96cf4420576edd9b67 SHA256 c1c3791cfdf76d7613424d6962585798d8150d925c6e6d4551536fbd7316fce2
-EBUILD orange-0.4.ebuild 654 RMD160 41596f20744186380c3d6d7ed54e3e59d1fa0716 SHA1 b08ccacbb7e0e05f6af4401956d0981f633d249c SHA256 6c065035cc91ee775e1d9c1766b02c498bd5ae361b55565a5e5f859200a47492
-MISC ChangeLog 2032 RMD160 e9d53faf3a6236df63d8b71c334017292ef13a3a SHA1 33b446500581d923edaef188648a2480102d1519 SHA256 7b697f0145602f2bd505330edae10f33b6a0688bb239f01fe61ad9e9ba9f33f1
+EBUILD orange-0.4.ebuild 905 RMD160 51083a81794d041466b0826773e89dd43c439ccb SHA1 8e4dcb4560f02dc41cf79709c47105222ea9699b SHA256 2d62026575778c6adb1c9505d6b1299878da83696f6c8c06ba58297db57a580d
+MISC ChangeLog 2170 RMD160 63c33c0c457d964551f927e425a6e8cb4c88cfaf SHA1 f9b8169266051b2cad7bd302810a8fd1c036b916 SHA256 c118463dc7b67ba5d14dfcd5ba01c209b5191f03279a914461b50953d6947ef2
 MISC metadata.xml 338 RMD160 7634311051db4ed5c7da5b3a8a70bb523a12a16b SHA1 7d3b8691d10b34a3a0a4f4e0388e4ffa30832888 SHA256 eeb85d7e16eda7b59e4fae5bc984f7aa5de2a3fbbbb5903a1ad9633e9efb2a47
diff --git a/app-pda/orange/orange-0.2-r1.ebuild b/app-pda/orange/orange-0.2-r1.ebuild
deleted file mode 100644
index d5fc87d715ed..000000000000
--- a/app-pda/orange/orange-0.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/orange/orange-0.2-r1.ebuild,v 1.9 2006/07/13 20:51:35 liquidx Exp $
-
-DESCRIPTION="A tool and library for extracting cabs from executable installers."
-HOMEPAGE="http://synce.sourceforge.net/synce/orange.php"
-SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND=">=app-pda/dynamite-0.1
-		>=app-arch/unshield-0.2
-		>=app-pda/synce-librapi2-0.8.9
-		>=app-pda/synce-libsynce-0.8.9"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -ie "s:-Werror::" lib/Makefile.am
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README
-}
diff --git a/app-pda/orange/orange-0.3.2.ebuild b/app-pda/orange/orange-0.3.2.ebuild
deleted file mode 100644
index e0ea45a0ffff..000000000000
--- a/app-pda/orange/orange-0.3.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/orange/orange-0.3.2.ebuild,v 1.3 2008/11/18 19:39:50 mescalinum Exp $
-
-MY_P="lib${P}"
-DESCRIPTION="A tool and library for extracting cabs from executable installers."
-HOMEPAGE="http://synce.sourceforge.net/synce/orange.php"
-SRC_URI="mirror://sourceforge/synce/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=app-pda/synce-libsynce-0.12
-		>=app-pda/dynamite-0.1.1
-		>=app-arch/unshield-0.5.1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-pda/orange/orange-0.3.ebuild b/app-pda/orange/orange-0.3.ebuild
deleted file mode 100644
index 6ab8e4404caf..000000000000
--- a/app-pda/orange/orange-0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/orange/orange-0.3.ebuild,v 1.3 2006/07/13 20:51:35 liquidx Exp $
-
-DESCRIPTION="A tool and library for extracting cabs from executable installers."
-HOMEPAGE="http://synce.sourceforge.net/synce/orange.php"
-SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=app-pda/dynamite-0.1
-		>=app-arch/unshield-0.5
-		>=app-pda/synce-librapi2-0.9.1
-		>=app-pda/synce-libsynce-0.9.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:-Werror::" lib/Makefile.am
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README
-}
diff --git a/app-pda/orange/orange-0.4.ebuild b/app-pda/orange/orange-0.4.ebuild
index 50ce7949e8bc..8126b5d2f94c 100644
--- a/app-pda/orange/orange-0.4.ebuild
+++ b/app-pda/orange/orange-0.4.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/orange/orange-0.4.ebuild,v 1.1 2009/01/21 00:03:39 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/orange/orange-0.4.ebuild,v 1.2 2010/11/04 20:03:59 ssuominen Exp $
+
+EAPI=2
+
+MY_P=lib${P}
 
-MY_P="lib${P}"
 DESCRIPTION="A tool and library for extracting cabs from executable installers."
 HOMEPAGE="http://synce.sourceforge.net/synce/orange.php"
 SRC_URI="mirror://sourceforge/synce/${MY_P}.tar.gz"
@@ -10,14 +13,27 @@ SRC_URI="mirror://sourceforge/synce/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="static-libs"
 
-DEPEND=">=app-pda/synce-libsynce-0.12
-		>=app-pda/dynamite-0.1.1
-		>=app-arch/unshield-0.5.1"
+RDEPEND=">=app-pda/synce-libsynce-0.12
+	>=app-pda/dynamite-0.1.1
+	>=app-arch/unshield-0.5.1
+	sys-apps/file
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static)
+}
 
 src_install() {
 	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog TODO
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }