Fix multiple issues, see ChangeLog and ebuild if intrested

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

3 files changed, 53 insertions, 28 deletions

diff --git a/app-pda/coldsync/ChangeLog b/app-pda/coldsync/ChangeLog
index a54bf8426f2e..d97d9e70d77a 100644
--- a/app-pda/coldsync/ChangeLog
+++ b/app-pda/coldsync/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-pda/coldsync
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.12 2011/03/31 06:11:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.13 2011/04/09 13:45:06 ssuominen Exp $
 
-  31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> coldsync-3.0_pre4.ebuild:
-  Let people install stable 2.2.5-r1 instead of development 3.0_pre4 and set
-  empty KEYWORDS="".
+  09 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> coldsync-3.0_pre4.ebuild:
+  Synchronize with 2.2.5-r1 ebuild. Install to perl vendor-dir instead of perl
+  site-dir wrt #297204. Export CC and CXX wrt #243694.
 
   31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> coldsync-2.2.5-r1.ebuild,
   +files/coldsync-2.2.5-toolchain.patch:
diff --git a/app-pda/coldsync/Manifest b/app-pda/coldsync/Manifest
index a6246fb9eddf..cb1fc1b4b0bd 100644
--- a/app-pda/coldsync/Manifest
+++ b/app-pda/coldsync/Manifest
@@ -5,13 +5,13 @@ AUX coldsync-2.2.5-toolchain.patch 589 RMD160 b4cd03e0e6b3c0747decc1f06471ca077c
 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 1599 RMD160 2bb186369d90044025994fbf5c9175590dc5803d SHA1 27d50456876068742b551542226ab6b2326a997b SHA256 5d96205320ac759921c88fdb082d88f03ac5a92dd9ce855ef450e13c041986c6
-EBUILD coldsync-3.0_pre4.ebuild 1502 RMD160 d8ac0d5dc7ed58d578a4c3f784f7da481335e0ee SHA1 35b411b78f2892831187798af2ab00454a1e6b5a SHA256 ed04d1cc93fb57611f777a3d806177c8d5bca4529df111f60799564224a00ae2
-MISC ChangeLog 2335 RMD160 4de8d2dcb4fb0217570a4a11c8919854f03e0d51 SHA1 cdec71c988fe3d4dee0581d60ec59772e1778a9f SHA256 247f2274368d9805ad9727844124338b64db52bbe566376616804c47a5149bd6
+EBUILD coldsync-3.0_pre4.ebuild 1745 RMD160 aaf36fe7d3817b1683ab1ac5550105fc315608e1 SHA1 48902c74dda5538d8ec49ffeef6782739e19ef13 SHA256 795a29295201bbbcad5ac28039e9c27282660c8ef05d40cf29b44cdd40e98678
+MISC ChangeLog 2371 RMD160 ee5cb6871c673624771e6111f8d8b69bab16daf5 SHA1 a5bad7151ce06f7a1a06464ea860758df7a31ce2 SHA256 e9934698cf03601a4c6cebfe52e63823b4ff9f35a5d5fa0107f12383bc29e08c
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2UG0cACgkQXkR9YqOcLPGRYAD+PML/4X0nUTTmD66hzA8gfEiG
-pBJcgxulbWyQsXrFNHABAIavuz2WcZpZVcf3waa40b5YmFBoWTd8nAuWQdBACIBG
-=rab5
+iF4EAREIAAYFAk2gYugACgkQXkR9YqOcLPEeJgD/TbXucjV85odoneqqjBMEOj7Z
+BCZFDvDBT9Ymm77N8iIA/2pENBxXFUYeYTTxNbNHI9T8k1HyqRcGhItgD9Jr0WYm
+=wH67
 -----END PGP SIGNATURE-----
diff --git a/app-pda/coldsync/coldsync-3.0_pre4.ebuild b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
index 075ac0ea02bc..aa92c0892bdc 100644
--- a/app-pda/coldsync/coldsync-3.0_pre4.ebuild
+++ b/app-pda/coldsync/coldsync-3.0_pre4.ebuild
@@ -1,42 +1,63 @@
 # 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.5 2011/03/31 06:11:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-3.0_pre4.ebuild,v 1.6 2011/04/09 13:45:06 ssuominen Exp $
 
 EAPI=2
+inherit flag-o-matic perl-module toolchain-funcs
 
-MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
 
 DESCRIPTION="A command-line tool to synchronize PalmOS PDAs with Unix workstations"
 HOMEPAGE="http://www.coldsync.org/"
-SRC_URI="http://www.coldsync.org/download/coldsync-${MY_PV}.tar.gz"
+SRC_URI="http://www.coldsync.org/download/${MY_P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-# Let people install working 2.2.5-r1 instead of this prerelease, also 243694 and 297204.
-#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-KEYWORDS=""
-IUSE="nls perl usb caps"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="caps nls perl usb"
 
-RDEPEND="usb? ( virtual/libusb:0 )
+RDEPEND="caps? ( sys-libs/libcap )
 	perl? ( dev-lang/perl )
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}"
+	usb? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if use perl; then
+		pushd perl/ColdSync
+		perl-module_src_prepare
+		popd
+	fi
+}
 
 src_configure() {
-	local myconf
+	tc-export CC CXX
+	append-cflags -fno-strict-aliasing
+	append-ldflags $(no-as-needed)
 
-	myconf="${myconf} `use_with perl`"
-	myconf="${myconf} `use_with nls i18n`"
-	myconf="${myconf} `use_with usb libusb`"
-	myconf="${myconf} `use_with caps capabilities`"
+	econf \
+		$(use_with nls i18n) \
+		$(use_with caps capabilities) \
+		$(use_with usb libusb) \
+		--without-perl
 
-	econf ${myconf}
+	if use perl; then
+		pushd perl/ColdSync
+		perl-module_src_configure
+		popd
+	fi
 }
 
 src_compile() {
 	emake -j1 || die #279292
+
+	if use perl; then
+		pushd perl/ColdSync
+		perl-module_src_compile
+		popd
+	fi
 }
 
 src_install() {
@@ -52,7 +73,11 @@ src_install() {
 		EXTRA_INFOFILES="" \
 		install || die
 
-	use perl && rm -f "${D}"/usr/lib/perl5/*/*/perllocal.pod
+	if use perl; then
+		pushd perl/ColdSync
+		perl-module_src_install
+		popd
+	fi
 
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
+	dodoc AUTHORS ChangeLog FAQ HACKING NEWS README* TODO
 }