| 1 |
ssuominen 11/03/31 05:49:23 |
| 2 |
|
| 3 |
Modified: ChangeLog coldsync-2.2.5-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix building with GCC 4.3+ and merge -broken-c++.diff and -gcc3.diff here. Keyword for ~amd64. Don't use strict aliasing. Respect CC and CXX wrt #243694 by Diego Elio Pettenò. Use perl-module.eclass wrt #297204 by Diego Elio Pettenò. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 app-pda/coldsync/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/ChangeLog?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/ChangeLog?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/ChangeLog?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- ChangeLog 27 Jul 2009 10:12:29 -0000 1.10 |
| 23 |
+++ ChangeLog 31 Mar 2011 05:49:22 -0000 1.11 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for app-pda/coldsync |
| 26 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.10 2009/07/27 10:12:29 flameeyes Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/ChangeLog,v 1.11 2011/03/31 05:49:22 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 31 Mar 2011; Samuli Suominen <ssuominen@g.o> coldsync-2.2.5-r1.ebuild, |
| 32 |
+ +files/coldsync-2.2.5-toolchain.patch: |
| 33 |
+ Fix building with GCC 4.3+ and merge -broken-c++.diff and -gcc3.diff here. |
| 34 |
+ Keyword for ~amd64. Don't use strict aliasing. Respect CC and CXX wrt #243694 |
| 35 |
+ by Diego Elio Pettenò. Use perl-module.eclass wrt #297204 by Diego Elio Pettenò. |
| 36 |
|
| 37 |
27 Jul 2009; Diego E. Pettenò <flameeyes@g.o> |
| 38 |
coldsync-3.0_pre4.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.12 app-pda/coldsync/coldsync-2.2.5-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild?rev=1.12&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild?rev=1.12&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild?r1=1.11&r2=1.12 |
| 47 |
|
| 48 |
Index: coldsync-2.2.5-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild,v |
| 51 |
retrieving revision 1.11 |
| 52 |
retrieving revision 1.12 |
| 53 |
diff -u -r1.11 -r1.12 |
| 54 |
--- coldsync-2.2.5-r1.ebuild 31 Mar 2011 04:38:40 -0000 1.11 |
| 55 |
+++ coldsync-2.2.5-r1.ebuild 31 Mar 2011 05:49:22 -0000 1.12 |
| 56 |
@@ -1,9 +1,9 @@ |
| 57 |
# Copyright 1999-2011 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild,v 1.11 2011/03/31 04:38:40 ssuominen Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/coldsync/coldsync-2.2.5-r1.ebuild,v 1.12 2011/03/31 05:49:22 ssuominen Exp $ |
| 61 |
|
| 62 |
EAPI=2 |
| 63 |
-inherit eutils |
| 64 |
+inherit eutils flag-o-matic perl-module toolchain-funcs |
| 65 |
|
| 66 |
DESCRIPTION="A command-line tool to synchronize PalmOS PDAs with Unix workstations" |
| 67 |
HOMEPAGE="http://www.coldsync.org/" |
| 68 |
@@ -11,19 +11,41 @@ |
| 69 |
|
| 70 |
LICENSE="Artistic" |
| 71 |
SLOT="0" |
| 72 |
-KEYWORDS="~ppc sparc x86" |
| 73 |
+KEYWORDS="~amd64 ~ppc sparc x86" |
| 74 |
IUSE="nls perl" |
| 75 |
|
| 76 |
+RDEPEND="perl? ( dev-lang/perl )" |
| 77 |
+DEPEND="${RDEPEND} |
| 78 |
+ nls? ( sys-devel/gettext )" |
| 79 |
+ |
| 80 |
src_prepare() { |
| 81 |
- epatch \ |
| 82 |
- "${FILESDIR}"/${PN}-2.2.5-gcc3.diff \ |
| 83 |
- "${FILESDIR}"/${PN}-2.2.5-broken-c++.diff |
| 84 |
+ epatch "${FILESDIR}"/${P}-toolchain.patch |
| 85 |
} |
| 86 |
|
| 87 |
src_configure() { |
| 88 |
+ tc-export CC CXX |
| 89 |
+ append-cflags -fno-strict-aliasing |
| 90 |
+ |
| 91 |
+ # TODO: i18n: msgfmt fails but doesn't || die |
| 92 |
econf \ |
| 93 |
$(use_with nls i18n) \ |
| 94 |
- $(use_with perl) |
| 95 |
+ --without-perl |
| 96 |
+ |
| 97 |
+ if use perl; then |
| 98 |
+ pushd perl/ColdSync |
| 99 |
+ perl-module_src_configure |
| 100 |
+ popd |
| 101 |
+ fi |
| 102 |
+} |
| 103 |
+ |
| 104 |
+src_compile() { |
| 105 |
+ default |
| 106 |
+ |
| 107 |
+ if use perl; then |
| 108 |
+ pushd perl/ColdSync |
| 109 |
+ perl-module_src_compile |
| 110 |
+ popd |
| 111 |
+ fi |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
| 115 |
@@ -38,5 +60,11 @@ |
| 116 |
INSTALLVENDORMAN3DIR="${D}"/usr/share/man/man3 \ |
| 117 |
install || die |
| 118 |
|
| 119 |
- dodoc AUTHORS ChangeLog HACKING NEWS README TODO |
| 120 |
+ if use perl; then |
| 121 |
+ pushd perl/ColdSync |
| 122 |
+ perl-module_src_install |
| 123 |
+ popd |
| 124 |
+ fi |
| 125 |
+ |
| 126 |
+ dodoc AUTHORS ChangeLog FAQ HACKING NEWS README* TODO |
| 127 |
} |
Archives