added patch for fix compile error, cleaned up patching in ebuild and changed to use_with for econf options. (#141222)

(Portage version: 2.1-r2)
 (Signed Manifest commit)

3 files changed, 36 insertions, 55 deletions

diff --git a/app-pda/coldsync/Manifest b/app-pda/coldsync/Manifest
index 93e34605ec3f..989d0b7f129b 100644
--- a/app-pda/coldsync/Manifest
+++ b/app-pda/coldsync/Manifest
@@ -1,27 +1,42 @@
-MD5 adf5924e571e896f6bb06a463f9a2532 ChangeLog 1292
-RMD160 bdec5452f1eade3d19ed6d0712e50e99bcfc9208 ChangeLog 1292
-SHA256 550f5536042eb86a81da55dd2c6fdf59259f3d554a7abf3d49e02ddeab551116 ChangeLog 1292
-MD5 e40087a9ead268a71c4523ea66418c15 coldsync-2.2.5-r1.ebuild 1160
-RMD160 463eb928da441218ae15420dff117a9d90971c3c coldsync-2.2.5-r1.ebuild 1160
-SHA256 ba858bf0c655c8a7fe7a3218fd58132d1d75a443a8a873055e780b031dcfa3ff coldsync-2.2.5-r1.ebuild 1160
-MD5 5b44e7598c5cfedaa73d9e14c8886d11 coldsync-2.2.5.ebuild 958
-RMD160 fecdb727708dc4ea01e9b0ae39df62f9419d3ee3 coldsync-2.2.5.ebuild 958
-SHA256 94803890a4fd6b69feceab8d9cb4b9783410cae0f6b268996a355fd93a609914 coldsync-2.2.5.ebuild 958
-MD5 278b71f782f5f83c46ce798fb4de2439 coldsync-3.0_pre4.ebuild 1511
-RMD160 2002e42069eed833793d7e81fa37952bb73f3b4a coldsync-3.0_pre4.ebuild 1511
-SHA256 3a3498f9dd20c18200f06ed274f7ae84a69bdcc36ff8e2f77feffde95c980303 coldsync-3.0_pre4.ebuild 1511
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX coldsync-2.2.5-broken-c++.diff 823 RMD160 6a96abda6162efe30f0fceb56fb6f7be8777a0d2 SHA1 97d03cb41c4e7641509c49a3c4fa7885e36e1f18 SHA256 8e5f4ced3ebc97ebf724a57d0225bd8872637fee8fd3668cda9d250870d604b4
+MD5 bb78b4846de4b39647b9842e7e0c3561 files/coldsync-2.2.5-broken-c++.diff 823
+RMD160 6a96abda6162efe30f0fceb56fb6f7be8777a0d2 files/coldsync-2.2.5-broken-c++.diff 823
+SHA256 8e5f4ced3ebc97ebf724a57d0225bd8872637fee8fd3668cda9d250870d604b4 files/coldsync-2.2.5-broken-c++.diff 823
+AUX coldsync-2.2.5-gcc3.diff 308 RMD160 a71cb0368978107db933314a4f2999ae1d701728 SHA1 b575f2bba2e38c439d8e2d0f08086e438c9eb8e1 SHA256 1b736cac84838d2dd38c79356994231554c3e8087dcb2b9635ab07ebfc833d03
 MD5 cc3ae92d1eed6d972a772c1682c1a1c9 files/coldsync-2.2.5-gcc3.diff 308
 RMD160 a71cb0368978107db933314a4f2999ae1d701728 files/coldsync-2.2.5-gcc3.diff 308
 SHA256 1b736cac84838d2dd38c79356994231554c3e8087dcb2b9635ab07ebfc833d03 files/coldsync-2.2.5-gcc3.diff 308
-MD5 04ecb777d14c4aa748b305fa0d64adea files/digest-coldsync-2.2.5 66
-RMD160 21b0c24188ce31b930bf6501af86f26e934f783d files/digest-coldsync-2.2.5 66
-SHA256 1f098378271d4aa2549a3466431d97d150d1fc08f6a1db9a13f1963971197628 files/digest-coldsync-2.2.5 66
-MD5 04ecb777d14c4aa748b305fa0d64adea files/digest-coldsync-2.2.5-r1 66
-RMD160 21b0c24188ce31b930bf6501af86f26e934f783d files/digest-coldsync-2.2.5-r1 66
-SHA256 1f098378271d4aa2549a3466431d97d150d1fc08f6a1db9a13f1963971197628 files/digest-coldsync-2.2.5-r1 66
-MD5 1563a6c1ef0e83764369911bf47ab502 files/digest-coldsync-3.0_pre4 253
-RMD160 1f2d3515e8c931f69953d5d2d0db1836b160e34a files/digest-coldsync-3.0_pre4 253
-SHA256 469a07c547795b49ed11854b320aecc8a777d3288ed0073fbdfd493a4d178d50 files/digest-coldsync-3.0_pre4 253
+DIST coldsync-2.2.5.tar.gz 663307 RMD160 76d1065c3558f26f22a94d67e26e0ed25a2367fd SHA1 0f12142d468d35974e11682848f9a949957ed739 SHA256 635575e2175a865827319ad21cbfbac95a42a7256730898ae9e9104b63b4fef6
+DIST coldsync-3.0-pre4.tar.gz 657305 RMD160 b4bc230a4056e2825d466dfbde2e05458c8ae8af SHA256 ca32dbcd1b2d3cbce8ee4e34aafb1183fc09c3ead69d308e76454a9c4c4728c3
+EBUILD coldsync-2.2.5-r1.ebuild 1149 RMD160 21ff5efffdf7cac553e03f45ec81b865526cc4c3 SHA1 6842691865d6206a0b88a6d40931a1bb13029e68 SHA256 4ca3694c0180abe1cd6b9e84a21a0b0678d96a59d2567ea4a73808c84764d05f
+MD5 1fdab2572bf5fe899310bc3de487c72b coldsync-2.2.5-r1.ebuild 1149
+RMD160 21ff5efffdf7cac553e03f45ec81b865526cc4c3 coldsync-2.2.5-r1.ebuild 1149
+SHA256 4ca3694c0180abe1cd6b9e84a21a0b0678d96a59d2567ea4a73808c84764d05f coldsync-2.2.5-r1.ebuild 1149
+EBUILD coldsync-3.0_pre4.ebuild 1511 RMD160 2002e42069eed833793d7e81fa37952bb73f3b4a SHA1 da26061da9d8eebee5d4c0e4f1dfe0001a4ccced SHA256 3a3498f9dd20c18200f06ed274f7ae84a69bdcc36ff8e2f77feffde95c980303
+MD5 278b71f782f5f83c46ce798fb4de2439 coldsync-3.0_pre4.ebuild 1511
+RMD160 2002e42069eed833793d7e81fa37952bb73f3b4a coldsync-3.0_pre4.ebuild 1511
+SHA256 3a3498f9dd20c18200f06ed274f7ae84a69bdcc36ff8e2f77feffde95c980303 coldsync-3.0_pre4.ebuild 1511
+MISC ChangeLog 1557 RMD160 47ede94304eefe211ab6f33ba659f5a2f7a8dcdf SHA1 f518fa89907574d8913408cd03a413f5d3340b57 SHA256 e31c4d2aa8703231942653e08e8c0a2d258502a2c91a0cc67e150729ffe7170e
+MD5 41384a0f5920b7f0028a7998b5f0ef2b ChangeLog 1557
+RMD160 47ede94304eefe211ab6f33ba659f5a2f7a8dcdf ChangeLog 1557
+SHA256 e31c4d2aa8703231942653e08e8c0a2d258502a2c91a0cc67e150729ffe7170e ChangeLog 1557
+MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe metadata.xml 156
 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb metadata.xml 156
+MD5 7047594f3f30103af30953fa5b9e66f6 files/digest-coldsync-2.2.5-r1 244
+RMD160 96709e77877885d45251b68b5d3f9b616952eedc files/digest-coldsync-2.2.5-r1 244
+SHA256 4de9977f327e959ceb1dfd6450b1788039b4054d08dca35864f576322533b8e8 files/digest-coldsync-2.2.5-r1 244
+MD5 1563a6c1ef0e83764369911bf47ab502 files/digest-coldsync-3.0_pre4 253
+RMD160 1f2d3515e8c931f69953d5d2d0db1836b160e34a files/digest-coldsync-3.0_pre4 253
+SHA256 469a07c547795b49ed11854b320aecc8a777d3288ed0073fbdfd493a4d178d50 files/digest-coldsync-3.0_pre4 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE6t1cuB6ZT1m7QRERAr47AJ9I4vocWcQTRHhu8G3Pydxk3kdVRQCgw4nb
+izP34g/AGbzm1OSOPUMlT58=
+=AVY9
+-----END PGP SIGNATURE-----
diff --git a/app-pda/coldsync/coldsync-2.2.5.ebuild b/app-pda/coldsync/coldsync-2.2.5.ebuild
deleted file mode 100644
index 6884d3e2ce8e..000000000000
--- a/app-pda/coldsync/coldsync-2.2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.6 2005/01/01 15:42:39 eradicator Exp $
-
-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/"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="x86 sparc"
-IUSE="nls perl"
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --without-i18n"
-	use perl || myconf="${myconf} --without-perl"
-
-	econf ${myconf} || die "configuring coldsync failed"
-	make || die "couldn't make coldsync"
-}
-
-src_install() {
-	make \
-		PREFIX=${D}/usr \
-		MANDIR=${D}/usr/share/man \
-		SYSCONFDIR=${D}/etc \
-		DATADIR=${D}/usr/share \
-		INFODIR=${D}/usr/share/info \
-		install || die "couldn't install coldsync"
-
-	dodoc AUTHORS Artistic ChangeLog HACKING INSTALL NEWS README TODO
-}
diff --git a/app-pda/coldsync/files/digest-coldsync-2.2.5 b/app-pda/coldsync/files/digest-coldsync-2.2.5
deleted file mode 100644
index 73055c37fa32..000000000000
--- a/app-pda/coldsync/files/digest-coldsync-2.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cba1d751a51d50a1983a7e0245820099 coldsync-2.2.5.tar.gz 663307