Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/getopt: getopt-1.1.5.ebuild ChangeLog
Date: Fri, 28 Dec 2012 10:48:04
Message-Id: 20121228104753.8E1722171D@flycatcher.gentoo.org
1 grobian 12/12/28 10:47:53
2
3 Modified: getopt-1.1.5.ebuild ChangeLog
4 Log:
5 Add back libintl bits for e.g. Solaris 10
6
7 (Portage version: 2.2.01.21418-prefix/cvs/SunOS sparc, signed Manifest commit with key 0x5F75F607C5C74E89)
8
9 Revision Changes Path
10 1.2 app-misc/getopt/getopt-1.1.5.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild?r1=1.1&r2=1.2
15
16 Index: getopt-1.1.5.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- getopt-1.1.5.ebuild 28 Dec 2012 09:10:26 -0000 1.1
23 +++ getopt-1.1.5.ebuild 28 Dec 2012 10:47:53 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild,v 1.1 2012/12/28 09:10:26 grobian Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild,v 1.2 2012/12/28 10:47:53 grobian Exp $
29
30 EAPI=3
31
32 @@ -20,6 +20,7 @@
33 nls? ( sys-devel/gettext )"
34
35 src_prepare() {
36 + epatch "${FILESDIR}"/${P}-libintl.patch
37 epatch "${FILESDIR}"/${P}-setlocale.patch
38 epatch "${FILESDIR}"/${P}-longrename.patch
39
40 @@ -29,15 +30,20 @@
41
42 src_compile() {
43 local nogettext="1"
44 + local libintl=""
45 local libcgetopt=1
46
47 - use nls && nogettext=0
48 + if use nls; then
49 + nogettext=0
50 + has_version sys-libs/glibc || libintl="-lintl"
51 + fi
52 +
53 [[ ${CHOST} == *-irix* ]] && libcgetopt=0
54 [[ ${CHOST} == *-interix* ]] && libcgetopt=0
55
56 emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \
57 LIBCGETOPT=${libcgetopt} \
58 - WITHOUT_GETTEXT=${nogettext} \
59 + WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \
60 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
61 }
62
63
64
65
66 1.9 app-misc/getopt/ChangeLog
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/ChangeLog?rev=1.9&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/ChangeLog?rev=1.9&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/ChangeLog?r1=1.8&r2=1.9
71
72 Index: ChangeLog
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v
75 retrieving revision 1.8
76 retrieving revision 1.9
77 diff -u -r1.8 -r1.9
78 --- ChangeLog 28 Dec 2012 09:10:26 -0000 1.8
79 +++ ChangeLog 28 Dec 2012 10:47:53 -0000 1.9
80 @@ -1,6 +1,10 @@
81 # ChangeLog for app-misc/getopt
82 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
83 -# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.8 2012/12/28 09:10:26 grobian Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.9 2012/12/28 10:47:53 grobian Exp $
85 +
86 + 28 Dec 2012; Fabian Groffen <grobian@g.o>
87 + +files/getopt-1.1.5-libintl.patch, getopt-1.1.5.ebuild:
88 + Add back libintl bits for e.g. Solaris 10
89
90 *getopt-1.1.5 (28 Dec 2012)