Gentoo Archives: gentoo-commits

From: Michael Haubenwallner <haubi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/files/, dev-libs/popt/
Date: Mon, 02 May 2016 10:57:20
Message-Id: 1462186544.f640c119b2d25a65f54f1b8a1d1293edeb590477.haubi@gentoo
1 commit: f640c119b2d25a65f54f1b8a1d1293edeb590477
2 Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
3 AuthorDate: Mon May 2 10:55:21 2016 +0000
4 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
5 CommitDate: Mon May 2 10:55:44 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f640c119
7
8 popt: Cygwin port, check for glob_pattern_p
9
10 dev-libs/popt/files/popt-1.16-glob_pattern_p.patch | 47 ++++++++++++++++++++++
11 dev-libs/popt/popt-1.16-r02.1.ebuild | 41 +++++++++++++++++++
12 2 files changed, 88 insertions(+)
13
14 diff --git a/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch b/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch
15 new file mode 100644
16 index 0000000..7fc3e2f
17 --- /dev/null
18 +++ b/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch
19 @@ -0,0 +1,47 @@
20 +http://rpm5.org/cvs/tktview?tn=93
21 +
22 +--- configure.ac
23 ++++ configure.ac
24 +#@@ -82,7 +82,7 @@
25 + AC_CHECK_FUNC(setreuid, [], [
26 + AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
27 + ])
28 +-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
29 ++AC_CHECK_FUNCS(getuid geteuid glob_pattern_p iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
30 +
31 + AM_GNU_GETTEXT([external])
32 + AM_ICONV_LINK
33 +--- config.h.in
34 ++++ config.h.in
35 +@@ -34,6 +34,9 @@
36 + /* Define to 1 if you have the `getuid' function. */
37 + #undef HAVE_GETUID
38 +
39 ++/* Define to 1 if you have the `glob_pattern_p' function. */
40 ++#undef HAVE_GLOB_PATTERN_P
41 ++
42 + /* Define to 1 if you have the <glob.h> header file. */
43 + #undef HAVE_GLOB_H
44 +
45 +--- configure
46 ++++ configure
47 +@@ -13505,7 +13505,7 @@
48 +
49 +
50 +
51 +-for ac_func in getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom
52 ++for ac_func in getuid geteuid glob_pattern_p iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom
53 + do
54 + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
55 + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
56 +--- poptconfig.c
57 ++++ poptconfig.c
58 +@@ -42,7 +42,7 @@
59 + /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
60 + #endif /* __LCLINT__ */
61 +
62 +-#if !defined(__GLIBC__)
63 ++#if !defined(HAVE_GLOB_PATTERN_P)
64 + /* Return nonzero if PATTERN contains any metacharacters.
65 + Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
66 + static int
67
68 diff --git a/dev-libs/popt/popt-1.16-r02.1.ebuild b/dev-libs/popt/popt-1.16-r02.1.ebuild
69 new file mode 100644
70 index 0000000..0bc07be
71 --- /dev/null
72 +++ b/dev-libs/popt/popt-1.16-r02.1.ebuild
73 @@ -0,0 +1,41 @@
74 +# Copyright 1999-2015 Gentoo Foundation
75 +# Distributed under the terms of the GNU General Public License v2
76 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.16-r2.ebuild,v 1.9 2015/03/13 19:55:13 zlogene Exp $
77 +
78 +EAPI=5
79 +
80 +inherit eutils libtool multilib-minimal
81 +
82 +DESCRIPTION="Parse Options - Command line parser"
83 +HOMEPAGE="http://rpm5.org/"
84 +SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
85 +
86 +LICENSE="MIT"
87 +SLOT="0"
88 +KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
89 +IUSE="nls static-libs"
90 +
91 +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
92 +DEPEND="nls? ( sys-devel/gettext )"
93 +
94 +src_prepare() {
95 + epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
96 + sed -i -e 's:lt-test1:test1:' testit.sh || die
97 +
98 + epatch "${FILESDIR}"/${PN}-1.16-glob_pattern_p.patch # for MiNT and Cygwin
99 + epatch "${FILESDIR}"/${PN}-1.13-no-wchar-hack.patch # for Interix and MiNT
100 + elibtoolize # for FreeMiNT
101 +}
102 +
103 +multilib_src_configure() {
104 + ECONF_SOURCE=${S} \
105 + econf \
106 + --disable-dependency-tracking \
107 + $(use_enable static-libs static) \
108 + $(use_enable nls)
109 +}
110 +
111 +multilib_src_install_all() {
112 + dodoc CHANGES README
113 + prune_libtool_files --all
114 +}