Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/getopt: metadata.xml ChangeLog getopt-1.1.4.ebuild
Date: Sat, 20 Feb 2010 05:29:46
Message-Id: E1NihuP-0007CX-AK@stork.gentoo.org
1 abcd 10/02/20 05:29:41
2
3 Modified: metadata.xml ChangeLog getopt-1.1.4.ebuild
4 Log:
5 Add prefix herd to metadata; merge prefix support from overlay
6 (Portage version: -svn/cvs/Linux i686)
7
8 Revision Changes Path
9 1.2 app-misc/getopt/metadata.xml
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/metadata.xml?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/metadata.xml?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/metadata.xml?r1=1.1&r2=1.2
14
15 Index: metadata.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-misc/getopt/metadata.xml,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- metadata.xml 24 May 2006 11:49:47 -0000 1.1
22 +++ metadata.xml 20 Feb 2010 05:29:40 -0000 1.2
23 @@ -2,4 +2,5 @@
24 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
25 <pkgmetadata>
26 <herd>bsd</herd>
27 +<herd>prefix</herd>
28 </pkgmetadata>
29
30
31
32 1.3 app-misc/getopt/ChangeLog
33
34 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/ChangeLog?rev=1.3&view=markup
35 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/ChangeLog?rev=1.3&content-type=text/plain
36 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/ChangeLog?r1=1.2&r2=1.3
37
38 Index: ChangeLog
39 ===================================================================
40 RCS file: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v
41 retrieving revision 1.2
42 retrieving revision 1.3
43 diff -u -r1.2 -r1.3
44 --- ChangeLog 11 Jul 2007 20:38:10 -0000 1.2
45 +++ ChangeLog 20 Feb 2010 05:29:40 -0000 1.3
46 @@ -1,6 +1,10 @@
47 # ChangeLog for app-misc/getopt
48 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
49 -# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.2 2007/07/11 20:38:10 uberlord Exp $
50 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
51 +# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.3 2010/02/20 05:29:40 abcd Exp $
52 +
53 + 20 Feb 2010; Jonathan Callen <abcd@g.o> getopt-1.1.4.ebuild,
54 + +files/getopt-1.1.4-irix.patch, metadata.xml:
55 + Add prefix herd to metadata; merge prefix support from overlay
56
57 11 Jul 2007; Roy Marples <uberlord@g.o> getopt-1.1.4.ebuild:
58 Keyworded ~sparc-fbsd.
59
60
61
62 1.3 app-misc/getopt/getopt-1.1.4.ebuild
63
64 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild?rev=1.3&view=markup
65 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild?rev=1.3&content-type=text/plain
66 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild?r1=1.2&r2=1.3
67
68 Index: getopt-1.1.4.ebuild
69 ===================================================================
70 RCS file: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild,v
71 retrieving revision 1.2
72 retrieving revision 1.3
73 diff -u -r1.2 -r1.3
74 --- getopt-1.1.4.ebuild 11 Jul 2007 20:38:10 -0000 1.2
75 +++ getopt-1.1.4.ebuild 20 Feb 2010 05:29:40 -0000 1.3
76 @@ -1,6 +1,8 @@
77 -# Copyright 1999-2007 Gentoo Foundation
78 +# Copyright 1999-2010 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80 -# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild,v 1.2 2007/07/11 20:38:10 uberlord Exp $
81 +# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild,v 1.3 2010/02/20 05:29:40 abcd Exp $
82 +
83 +EAPI=3
84
85 inherit toolchain-funcs eutils
86
87 @@ -10,37 +12,42 @@
88
89 LICENSE="GPL-2"
90 SLOT="0"
91 -KEYWORDS="~sparc-fbsd ~x86-fbsd"
92 +KEYWORDS="~sparc-fbsd ~x86-fbsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
93 IUSE="nls"
94
95 RDEPEND="nls? ( virtual/libintl )"
96 DEPEND="${RDEPEND}
97 nls? ( sys-devel/gettext )"
98
99 -src_unpack() {
100 - unpack ${A}
101 - cd "${S}"
102 -
103 +src_prepare() {
104 epatch "${FILESDIR}/${P}-libintl.patch"
105 epatch "${FILESDIR}/${P}-longrename.patch"
106 +
107 + # hopefully this is portable enough
108 + epatch "${FILESDIR}"/${P}-irix.patch
109 }
110
111 src_compile() {
112 local nogettext="1"
113 local libintl=""
114 + local libcgetopt=1
115
116 if use nls; then
117 nogettext=0
118 has_version sys-libs/glibc || libintl="-lintl"
119 fi
120
121 - emake CC="$(tc-getCC)" prefix="/usr" \
122 + [[ ${CHOST} == *-irix* ]] && libcgetopt=0
123 + [[ ${CHOST} == *-interix* ]] && libcgetopt=0
124 +
125 + emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \
126 + LIBCGETOPT=${libcgetopt} \
127 WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \
128 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
129 }
130
131 src_install() {
132 - use nls && make prefix="/usr" DESTDIR="${D}" install_po
133 + use nls && make prefix="${EPREFIX}/usr" DESTDIR="${D}" install_po
134
135 into /usr
136 newbin getopt getopt-long