Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/recode: ChangeLog recode-3.6_p17-r2.ebuild recode-3.6_p17-r1.ebuild
Date: Thu, 24 Jun 2010 08:14:11
Message-Id: 20100624081408.5AF212CF43@corvid.gentoo.org
1 jlec 10/06/24 08:14:08
2
3 Modified: ChangeLog
4 Added: recode-3.6_p17-r2.ebuild
5 Removed: recode-3.6_p17-r1.ebuild
6 Log:
7 Dropped ppc-macos-new.diff for all non prefix arches, #324519
8 (Portage version: 2.2_rc67/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.82 app-text/recode/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/recode/ChangeLog?rev=1.82&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/recode/ChangeLog?rev=1.82&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/recode/ChangeLog?r1=1.81&r2=1.82
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v
20 retrieving revision 1.81
21 retrieving revision 1.82
22 diff -u -r1.81 -r1.82
23 --- ChangeLog 15 Jun 2010 12:00:12 -0000 1.81
24 +++ ChangeLog 24 Jun 2010 08:14:08 -0000 1.82
25 @@ -1,6 +1,12 @@
26 # ChangeLog for app-text/recode
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.81 2010/06/15 12:00:12 jlec Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.82 2010/06/24 08:14:08 jlec Exp $
30 +
31 +*recode-3.6_p17-r2 (24 Jun 2010)
32 +
33 + 24 Jun 2010; Justin Lecher <jlec@g.o> -recode-3.6_p17-r1.ebuild,
34 + +recode-3.6_p17-r2.ebuild:
35 + Dropped ppc-macos-new.diff for all non prefix arches, #324519
36
37 *recode-3.6_p17-r1 (15 Jun 2010)
38
39
40
41
42 1.1 app-text/recode/recode-3.6_p17-r2.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/recode/recode-3.6_p17-r2.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/recode/recode-3.6_p17-r2.ebuild?rev=1.1&content-type=text/plain
46
47 Index: recode-3.6_p17-r2.ebuild
48 ===================================================================
49 # Copyright 1999-2010 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p17-r2.ebuild,v 1.1 2010/06/24 08:14:08 jlec Exp $
52
53 EAPI="3"
54
55 inherit autotools eutils flag-o-matic libtool toolchain-funcs
56
57 MY_P=${P%_*}
58 MY_PV=${PV%_*}
59 DEB_PATCH=${PV#*p}
60
61 DESCRIPTION="Convert files between various character sets"
62 HOMEPAGE="http://recode.progiciels-bpi.ca/"
63 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz
64 mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.diff.gz"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
69 IUSE="nls"
70
71 DEPEND="
72 sys-devel/flex
73 nls? ( sys-devel/gettext )"
74 RDEPEND=""
75
76 S=${WORKDIR}/${MY_P}
77
78 src_prepare() {
79 epatch "${FILESDIR}/${MY_P}-gettextfix.diff" #239372
80 epatch "${FILESDIR}"/${MY_P}-as-if.patch #283029
81 epatch "${WORKDIR}"/${PN}_${MY_PV}-${DEB_PATCH}.diff
82 sed -i '1i#include <stdlib.h>' src/argmatch.c || die
83
84 # Needed under FreeBSD, too
85 # Needed under Interix too
86 # now replaced by the -new.patch ...
87 # epatch "${FILESDIR}"/${MY_P}-ppc-macos.diff
88 if use x86-fbsd || use x86-interix || use ppc-macos; then
89 epatch "${FILESDIR}"/${MY_P}-ppc-macos-new.diff
90 fi
91 [[ ${CHOST} == *-interix[35]* ]] && epatch "${FILESDIR}"/${PN}-3.6-interix-getopt.patch
92 cp lib/error.c lib/xstrdup.c lib/getopt.c lib/getopt1.c src/ || die "file copy failed"
93
94 # Remove old libtool macros
95 rm "${S}"/acinclude.m4
96
97 eautoreconf
98 elibtoolize
99 }
100
101 src_configure() {
102 tc-export CC LD
103 # on solaris -lintl is needed to compile
104 [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
105 # --without-included-gettext means we always use system headers
106 # and library
107 econf --without-included-gettext $(use_enable nls)
108 }
109
110 src_install() {
111 emake DESTDIR="${D}" install || die "make install failed"
112 dodoc AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO
113 rm -f "${ED}"/usr/lib/charset.alias
114 }