5 files changed, 29 insertions, 94 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/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 '{}' +
 }