Fix repoman issues and majorly clean up the ebuilds

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

3 files changed, 57 insertions, 62 deletions

diff --git a/app-pda/coldsync/Manifest b/app-pda/coldsync/Manifest
index c134f8a060b6..a196389ba878 100644
--- a/app-pda/coldsync/Manifest
+++ b/app-pda/coldsync/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX coldsync-2.2.5-broken-c++.diff 823 RMD160 6a96abda6162efe30f0fceb56fb6f7be8777a0d2 SHA1 97d03cb41c4e7641509c49a3c4fa7885e36e1f18 SHA256 8e5f4ced3ebc97ebf724a57d0225bd8872637fee8fd3668cda9d250870d604b4
 AUX coldsync-2.2.5-gcc3.diff 308 RMD160 a71cb0368978107db933314a4f2999ae1d701728 SHA1 b575f2bba2e38c439d8e2d0f08086e438c9eb8e1 SHA256 1b736cac84838d2dd38c79356994231554c3e8087dcb2b9635ab07ebfc833d03
 DIST coldsync-2.2.5.tar.gz 663307 RMD160 76d1065c3558f26f22a94d67e26e0ed25a2367fd SHA1 0f12142d468d35974e11682848f9a949957ed739 SHA256 635575e2175a865827319ad21cbfbac95a42a7256730898ae9e9104b63b4fef6
 DIST coldsync-3.0-pre4.tar.gz 657305 RMD160 b4bc230a4056e2825d466dfbde2e05458c8ae8af SHA1 c6210b020ba51d3d101c82c2bf77257cb22d8e23 SHA256 ca32dbcd1b2d3cbce8ee4e34aafb1183fc09c3ead69d308e76454a9c4c4728c3
-EBUILD coldsync-2.2.5-r1.ebuild 1150 RMD160 c55415710bad5e7baccdb62e188bff62598ea16c SHA1 e067129f404c3fa392d0701cbee10689ab84bac3 SHA256 eb175d0b72195295d2683c268c9ece38ad68ee0b0e5ae385a98adf80e91862f6
-EBUILD coldsync-3.0_pre4.ebuild 1534 RMD160 af9310739ea82e7dfc552d04731fb9d09c4953ca SHA1 99f7af38170c2d7531ca1957a8489838c1052308 SHA256 b9f688504d584b087b23aa8409501fcae73c4cb837c3151b4135355b3d3cf133
+EBUILD coldsync-2.2.5-r1.ebuild 1064 RMD160 a668e0ef91e0040255308c94cd30ad67b3df5262 SHA1 62f0e755d0c00158ea4a88f1d49589d84eb3d988 SHA256 cc7f0da23dc19ea2f94df53af594bb41a846443d2086401007cb0e7773757d25
+EBUILD coldsync-3.0_pre4.ebuild 1487 RMD160 d4081cc6dfb27b58562082c24aa0b50d2a9e6030 SHA1 60930a375e7c3f65c8023d0115ae3ed8a931f767 SHA256 2f1bf92944c8cc57b0e23e6ee129168e3ffb0a1a23ecfa971c5da4893fff966e
 MISC ChangeLog 1792 RMD160 0f45d84e81e59ce966fa614f31c2de30e8de81ea SHA1 a06022102eee50c435909b99aea406746d9e802b SHA256 bb0984a70e9cc5c8ca3372b6d65b29814b3a289fd5644f144feceb79441d3854
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkptfZMACgkQAiZjviIA2XjuJQCfTF4iZEVV5QZ+pIsdFzMW4xuh
-8oQAoLpGMnbn2wUE1KMAAgP3hRPfx49r
-=y4QY
------END PGP SIGNATURE-----
diff --git a/app-pda/coldsync/coldsync-2.2.5-r1.ebuild b/app-pda/coldsync/coldsync-2.2.5-r1.ebuild
index bd57b122cbec..aa8bca827a60 100644
--- a/app-pda/coldsync/coldsync-2.2.5-r1.ebuild
+++ b/app-pda/coldsync/coldsync-2.2.5-r1.ebuild
@@ -1,42 +1,41 @@
-# Copyright 1999-2006 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-2.2.5-r1.ebuild,v 1.9 2007/06/26 01:41:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild,v 1.10 2011/02/10 15:06:25 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="A command-line tool to synchronize PalmOS PDAs with Unix workstations"
-SRC_URI="http://www.coldsync.org/download/${P}.tar.gz"
 HOMEPAGE="http://www.coldsync.org/"
+SRC_URI="http://www.coldsync.org/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="~ppc sparc x86"
 IUSE="nls perl"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/coldsync-2.2.5-gcc3.diff
-	epatch ${FILESDIR}/coldsync-2.2.5-broken-c++.diff
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.5-gcc3.diff \
+		"${FILESDIR}"/${PN}-2.2.5-broken-c++.diff
 }
 
-src_compile() {
-	cd ${S}
-	econf $(use_with nls i18n) $(use_with perl)
-	make || die "couldn't make coldsync"
+src_configure() {
+	econf \
+		$(use_with nls i18n) \
+		$(use_with perl)
 }
 
 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 \
-		install || die "couldn't install coldsync"
+	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 \
+		install || die
 
-	dodoc AUTHORS Artistic ChangeLog HACKING INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
 }
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
 }