Fix repoman issues and majorly clean up the ebuilds

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

1 files changed, 32 insertions, 26 deletions

diff --git a/app-pda/coldsync/coldsync-3.0_pre4.ebuild b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
index 3cd9a5cc5374..d1aa08d9fc23 100644
--- a/app-pda/coldsync/coldsync-3.0_pre4.ebuild
+++ b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
@@ -1,24 +1,28 @@
-# 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-pda/coldsync/coldsync-3.0_pre4.ebuild,v 1.2 2009/07/27 10:12:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild,v 1.3 2011/02/10 15:06:25 ssuominen Exp $
+
+EAPI=2
+
+MY_PV=${PV/_/-}
 
 DESCRIPTION="A command-line tool to synchronize PalmOS PDAs with Unix workstations"
-MY_PV="${PV/_/-}"
-SRC_URI="http://www.coldsync.org/download/coldsync-${MY_PV}.tar.gz"
 HOMEPAGE="http://www.coldsync.org/"
+SRC_URI="http://www.coldsync.org/download/coldsync-${MY_PV}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc"
 IUSE="nls perl usb caps"
 
-DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )
-		perl? ( dev-lang/perl )
-		caps? ( sys-libs/libcap )"
+RDEPEND="usb? ( virtual/libusb:0 )
+	perl? ( dev-lang/perl )
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
-src_compile() {
+src_configure() {
 	local myconf
 	#use nls || myconf="${myconf} --without-i18n"
 	#use perl || myconf="${myconf} --without-perl"
@@ -28,25 +32,27 @@ src_compile() {
 	myconf="${myconf} `use_with usb libusb`"
 	myconf="${myconf} `use_with caps capabilities`"
 
-	econf ${myconf} || die "configuring coldsync failed"
+	econf ${myconf}
+}
 
-	# bug #279292
-	emake -j1 || die "couldn't make coldsync"
+src_compile() {
+	emake -j1 || die #279292
 }
 
 src_install() {
-	make \
-	PREFIX=${D}/usr \
-	MANDIR=${D}/usr/share/man \
-	SYSCONFDIR=${D}/etc \
-	DATADIR=${D}/usr/share \
-	INFODIR=${D}/usr/share/info \
-	INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-	INSTALLSITEMAN3DIR=${D}/usr/share/man/man3 \
-	INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3 \
-	EXTRA_INFOFILES="" \
-	install || die "couldn't install coldsync"
-	use perl && rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod
-
-	dodoc AUTHORS Artistic ChangeLog HACKING INSTALL NEWS README TODO
+	emake \
+		PREFIX="${D}"/usr \
+		MANDIR="${D}"/usr/share/man \
+		SYSCONFDIR="${D}"/etc \
+		DATADIR="${D}"/usr/share \
+		INFODIR="${D}"/usr/share/info \
+		INSTALLMAN3DIR="${D}"/usr/share/man/man3 \
+		INSTALLSITEMAN3DIR="${D}"/usr/share/man/man3 \
+		INSTALLVENDORMAN3DIR="${D}"/usr/share/man/man3 \
+		EXTRA_INFOFILES="" \
+		install || die
+
+	use perl && rm -f "${D}"/usr/lib/perl5/*/*/perllocal.pod
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
 }