| 1 |
commit: 9bc96591382502e4c6d79de227c0028718fcd667 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 1 12:24:09 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 1 12:28:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9bc96591 |
| 7 |
|
| 8 |
dev-libs/popt: migrate to ::gentoo |
| 9 |
|
| 10 |
The interix/mint/cygwin patches no longer seem to: |
| 11 |
1) be relevant, or |
| 12 |
2) have been applied upstream. |
| 13 |
|
| 14 |
This lets us grab a version bump and stop using the overlay version. |
| 15 |
|
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-libs/popt/Manifest | 1 - |
| 19 |
.../popt/files/fix-popt-pkgconfig-libdir.patch | 12 ------ |
| 20 |
dev-libs/popt/files/popt-1.10.4-lib64.patch | 14 ------- |
| 21 |
dev-libs/popt/files/popt-1.10.4-regression.patch | 13 ------ |
| 22 |
.../files/popt-1.10.7-scrub-lame-gettext.patch | 26 ------------ |
| 23 |
.../popt/files/popt-1.12-scrub-lame-gettext.patch | 27 ------------- |
| 24 |
.../popt/files/popt-1.13-no-acfunc-iconv.patch | 24 ----------- |
| 25 |
dev-libs/popt/files/popt-1.13-no-wchar-hack.patch | 17 -------- |
| 26 |
dev-libs/popt/files/popt-1.14-interix.patch | 19 --------- |
| 27 |
dev-libs/popt/files/popt-1.15-check.patch | 21 ---------- |
| 28 |
dev-libs/popt/files/popt-1.15-interix.patch | 17 -------- |
| 29 |
dev-libs/popt/files/popt-1.15-mint.patch | 13 ------ |
| 30 |
dev-libs/popt/files/popt-1.16-glob_pattern_p.patch | 47 ---------------------- |
| 31 |
dev-libs/popt/metadata.xml | 8 ---- |
| 32 |
dev-libs/popt/popt-1.16-r2.ebuild | 41 ------------------- |
| 33 |
15 files changed, 300 deletions(-) |
| 34 |
|
| 35 |
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest |
| 36 |
deleted file mode 100644 |
| 37 |
index 58bac3e2e6..0000000000 |
| 38 |
--- a/dev-libs/popt/Manifest |
| 39 |
+++ /dev/null |
| 40 |
@@ -1 +0,0 @@ |
| 41 |
-DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694 |
| 42 |
|
| 43 |
diff --git a/dev-libs/popt/files/fix-popt-pkgconfig-libdir.patch b/dev-libs/popt/files/fix-popt-pkgconfig-libdir.patch |
| 44 |
deleted file mode 100644 |
| 45 |
index 32e1bb3530..0000000000 |
| 46 |
--- a/dev-libs/popt/files/fix-popt-pkgconfig-libdir.patch |
| 47 |
+++ /dev/null |
| 48 |
@@ -1,12 +0,0 @@ |
| 49 |
-diff -u popt-1.16.orig/Makefile.in popt-1.16/Makefile.in |
| 50 |
---- popt-1.16.orig/Makefile.in 2010-05-04 16:55:59.000000000 -0400 |
| 51 |
-+++ popt-1.16/Makefile.in 2010-12-23 22:45:42.843131000 -0500 |
| 52 |
-@@ -370,7 +370,7 @@ |
| 53 |
- libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c |
| 54 |
- libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ \ |
| 55 |
- $(am__append_1) |
| 56 |
--pkgconfigdir = $(prefix)/lib/pkgconfig |
| 57 |
-+pkgconfigdir = $(libdir)/pkgconfig |
| 58 |
- pkgconfig_DATA = popt.pc |
| 59 |
- man_MANS = popt.3 |
| 60 |
- BUILT_SOURCES = popt.pc # popt.lcd |
| 61 |
|
| 62 |
diff --git a/dev-libs/popt/files/popt-1.10.4-lib64.patch b/dev-libs/popt/files/popt-1.10.4-lib64.patch |
| 63 |
deleted file mode 100644 |
| 64 |
index 3cc8ce820e..0000000000 |
| 65 |
--- a/dev-libs/popt/files/popt-1.10.4-lib64.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,14 +0,0 @@ |
| 68 |
-It doesnt matter if MARK64 gets set in the configure file as the toplevel |
| 69 |
-makefile is the only thing that uses it ... plus we avoid re-running autotools |
| 70 |
- |
| 71 |
---- popt-1.10.4/Makefile.in |
| 72 |
-+++ popt-1.10.4/Makefile.in |
| 73 |
-@@ -35,7 +35,7 @@ |
| 74 |
- |
| 75 |
- TESTS = testit.sh |
| 76 |
- include_HEADERS = popt.h |
| 77 |
--usrlibdir = $(libdir)@MARK64@ |
| 78 |
-+usrlibdir = $(libdir) |
| 79 |
- usrlib_LTLIBRARIES = libpopt.la |
| 80 |
- libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c |
| 81 |
- libpopt_la_LDFLAGS = -no-undefined @INTLLIBS@ $(am__append_1) |
| 82 |
|
| 83 |
diff --git a/dev-libs/popt/files/popt-1.10.4-regression.patch b/dev-libs/popt/files/popt-1.10.4-regression.patch |
| 84 |
deleted file mode 100644 |
| 85 |
index 83ed0229e9..0000000000 |
| 86 |
--- a/dev-libs/popt/files/popt-1.10.4-regression.patch |
| 87 |
+++ /dev/null |
| 88 |
@@ -1,13 +0,0 @@ |
| 89 |
---- popt.c.bak |
| 90 |
-+++ popt.c |
| 91 |
-@@ -748,9 +748,7 @@ |
| 92 |
- if (origOptString == NULL) /* XXX can't happen */ |
| 93 |
- return POPT_ERROR_BADOPT; |
| 94 |
- |
| 95 |
-- if (con->restLeftover || *origOptString != '-' || |
| 96 |
-- (*origOptString == '-' && origOptString[1] == '\0')) |
| 97 |
-- { |
| 98 |
-+ if (con->restLeftover || *origOptString != '-') { |
| 99 |
- if (con->flags & POPT_CONTEXT_POSIXMEHARDER) |
| 100 |
- con->restLeftover = 1; |
| 101 |
- if (con->flags & POPT_CONTEXT_ARG_OPTS) { |
| 102 |
|
| 103 |
diff --git a/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch b/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch |
| 104 |
deleted file mode 100644 |
| 105 |
index 80c8245eb2..0000000000 |
| 106 |
--- a/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch |
| 107 |
+++ /dev/null |
| 108 |
@@ -1,26 +0,0 @@ |
| 109 |
-this serves no real purpose |
| 110 |
- |
| 111 |
---- configure |
| 112 |
-+++ configure |
| 113 |
-@@ -20471,21 +20471,6 @@ |
| 114 |
- fi |
| 115 |
- |
| 116 |
- |
| 117 |
--if test ! -f ../rpm.c |
| 118 |
--then |
| 119 |
-- echo "$as_me:$LINENO: checking for GNU xgettext" >&5 |
| 120 |
--echo $ECHO_N "checking for GNU xgettext... $ECHO_C" >&6 |
| 121 |
-- xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: |
| 122 |
-- *** GNU gettext is required. The latest version |
| 123 |
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&5 |
| 124 |
--echo "$as_me: error: |
| 125 |
-- *** GNU gettext is required. The latest version |
| 126 |
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&2;} |
| 127 |
-- { (exit 1); exit 1; }; } |
| 128 |
-- echo "$as_me:$LINENO: result: yes" >&5 |
| 129 |
--echo "${ECHO_T}yes" >&6 |
| 130 |
--fi |
| 131 |
-- |
| 132 |
- echo "$as_me:$LINENO: checking for setreuid" >&5 |
| 133 |
- echo $ECHO_N "checking for setreuid... $ECHO_C" >&6 |
| 134 |
- if test "${ac_cv_func_setreuid+set}" = set; then |
| 135 |
|
| 136 |
diff --git a/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch b/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch |
| 137 |
deleted file mode 100644 |
| 138 |
index a247bcbf34..0000000000 |
| 139 |
--- a/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch |
| 140 |
+++ /dev/null |
| 141 |
@@ -1,27 +0,0 @@ |
| 142 |
-this serves no real purpose |
| 143 |
- |
| 144 |
-http://bugs.gentoo.org/161988 |
| 145 |
- |
| 146 |
---- configure |
| 147 |
-+++ configure |
| 148 |
-@@ -20981,20 +20981,6 @@ |
| 149 |
- fi |
| 150 |
- |
| 151 |
- |
| 152 |
--if test ! -f ../rpm.c |
| 153 |
--then |
| 154 |
-- { echo "$as_me:$LINENO: checking for GNU xgettext" >&5 |
| 155 |
--echo $ECHO_N "checking for GNU xgettext... $ECHO_C" >&6; } |
| 156 |
-- xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: |
| 157 |
-- *** GNU gettext is required. The latest version |
| 158 |
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&5 |
| 159 |
--echo "$as_me: error: |
| 160 |
-- *** GNU gettext is required. The latest version |
| 161 |
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&2;} |
| 162 |
-- { (exit 1); exit 1; }; } |
| 163 |
-- { echo "$as_me:$LINENO: result: yes" >&5 |
| 164 |
--echo "${ECHO_T}yes" >&6; } |
| 165 |
--fi |
| 166 |
- |
| 167 |
- { echo "$as_me:$LINENO: checking for setreuid" >&5 |
| 168 |
- echo $ECHO_N "checking for setreuid... $ECHO_C" >&6; } |
| 169 |
|
| 170 |
diff --git a/dev-libs/popt/files/popt-1.13-no-acfunc-iconv.patch b/dev-libs/popt/files/popt-1.13-no-acfunc-iconv.patch |
| 171 |
deleted file mode 100644 |
| 172 |
index d32899c1a4..0000000000 |
| 173 |
--- a/dev-libs/popt/files/popt-1.13-no-acfunc-iconv.patch |
| 174 |
+++ /dev/null |
| 175 |
@@ -1,24 +0,0 @@ |
| 176 |
-diff -ru popt-1.13.orig/configure popt-1.13/configure |
| 177 |
---- popt-1.13.orig/configure Fri Jan 18 13:33:27 2008 |
| 178 |
-+++ popt-1.13/configure Fri Jan 18 13:34:10 2008 |
| 179 |
-@@ -21220,7 +21220,7 @@ |
| 180 |
- |
| 181 |
- |
| 182 |
- |
| 183 |
--for ac_func in getuid geteuid mtrace __secure_getenv setregid strerror iconv |
| 184 |
-+for ac_func in getuid geteuid mtrace __secure_getenv setregid strerror |
| 185 |
- do |
| 186 |
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
| 187 |
- { echo "$as_me:$LINENO: checking for $ac_func" >&5 |
| 188 |
-#diff -ru popt-1.13.orig/configure.ac popt-1.13/configure.ac |
| 189 |
-#--- popt-1.13.orig/configure.ac Fri Jan 18 13:33:27 2008 |
| 190 |
-#+++ popt-1.13/configure.ac Fri Jan 18 13:34:01 2008 |
| 191 |
-#@@ -92,7 +92,7 @@ |
| 192 |
-# AC_CHECK_FUNC(setreuid, [], [ |
| 193 |
-# AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) |
| 194 |
-# ]) |
| 195 |
-#-AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv) |
| 196 |
-#+AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror) |
| 197 |
-# |
| 198 |
-# AM_GNU_GETTEXT([external]) |
| 199 |
-# |
| 200 |
|
| 201 |
diff --git a/dev-libs/popt/files/popt-1.13-no-wchar-hack.patch b/dev-libs/popt/files/popt-1.13-no-wchar-hack.patch |
| 202 |
deleted file mode 100644 |
| 203 |
index 877cb7eaed..0000000000 |
| 204 |
--- a/dev-libs/popt/files/popt-1.13-no-wchar-hack.patch |
| 205 |
+++ /dev/null |
| 206 |
@@ -1,17 +0,0 @@ |
| 207 |
-popt contains a hack for wchars that is enabled by default |
| 208 |
-but breaks the build (at least) on interix. |
| 209 |
- |
| 210 |
-diff -ru popt-1.13.orig/popthelp.c popt-1.13/popthelp.c |
| 211 |
---- popt-1.13.orig/popthelp.c Fri Jan 18 13:58:02 2008 |
| 212 |
-+++ popt-1.13/popthelp.c Fri Jan 18 14:00:21 2008 |
| 213 |
-@@ -15,7 +15,9 @@ |
| 214 |
- #include <sys/ioctl.h> |
| 215 |
- #endif |
| 216 |
- |
| 217 |
--#define POPT_WCHAR_HACK |
| 218 |
-+#if !defined(__INTERIX) && !defined(__MINT__) |
| 219 |
-+# define POPT_WCHAR_HACK |
| 220 |
-+#endif |
| 221 |
- #ifdef POPT_WCHAR_HACK |
| 222 |
- #include <wchar.h> /* for mbsrtowcs */ |
| 223 |
- /*@access mbstate_t @*/ |
| 224 |
|
| 225 |
diff --git a/dev-libs/popt/files/popt-1.14-interix.patch b/dev-libs/popt/files/popt-1.14-interix.patch |
| 226 |
deleted file mode 100644 |
| 227 |
index d274e8915c..0000000000 |
| 228 |
--- a/dev-libs/popt/files/popt-1.14-interix.patch |
| 229 |
+++ /dev/null |
| 230 |
@@ -1,19 +0,0 @@ |
| 231 |
-diff -ru popt-1.14.orig/popt.c popt-1.14/popt.c |
| 232 |
---- popt-1.14.orig/popt.c 2009-08-04 16:20:49 +0200 |
| 233 |
-+++ popt-1.14/popt.c 2009-08-04 16:23:09 +0200 |
| 234 |
-@@ -1067,7 +1067,15 @@ |
| 235 |
- char *end = NULL; |
| 236 |
- |
| 237 |
- if (con->os->nextArg) { |
| 238 |
-+ #ifdef __INTERIX |
| 239 |
-+ /* interix only has strtol ... so long long not supported here! */ |
| 240 |
-+ if(opt->arg == POPT_ARG_LONGLONG) |
| 241 |
-+ return POPT_ERROR_BADNUMBER; |
| 242 |
-+ |
| 243 |
-+ aNUM = strtol(con->os->nextArg, &end, 0); |
| 244 |
-+ #else |
| 245 |
- aNUM = strtoll(con->os->nextArg, &end, 0); |
| 246 |
-+ #endif |
| 247 |
- if (!(end && *end == '\0')) |
| 248 |
- return POPT_ERROR_BADNUMBER; |
| 249 |
- } |
| 250 |
|
| 251 |
diff --git a/dev-libs/popt/files/popt-1.15-check.patch b/dev-libs/popt/files/popt-1.15-check.patch |
| 252 |
deleted file mode 100644 |
| 253 |
index 242643f264..0000000000 |
| 254 |
--- a/dev-libs/popt/files/popt-1.15-check.patch |
| 255 |
+++ /dev/null |
| 256 |
@@ -1,21 +0,0 @@ |
| 257 |
-diff -ur popt-1.15.orig/testit.sh popt-1.15/testit.sh |
| 258 |
---- popt-1.15.orig/testit.sh 2009-04-12 10:08:59.000000000 +0300 |
| 259 |
-+++ popt-1.15/testit.sh 2009-09-24 14:10:40.000000000 +0300 |
| 260 |
-@@ -111,7 +111,7 @@ |
| 261 |
- run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr |
| 262 |
- |
| 263 |
- run test1 "test1 - 55" "\ |
| 264 |
--Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] |
| 265 |
-+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] |
| 266 |
- [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] |
| 267 |
- [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG] |
| 268 |
- [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT] |
| 269 |
-@@ -120,7 +120,7 @@ |
| 270 |
- [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage |
| 271 |
- |
| 272 |
- run test1 "test1 - 56" "\ |
| 273 |
--Usage: lt-test1 [OPTION...] |
| 274 |
-+Usage: test1 [OPTION...] |
| 275 |
- --arg1 First argument with a really long |
| 276 |
- description. After all, we have to test |
| 277 |
- argument help wrapping somehow, right? |
| 278 |
|
| 279 |
diff --git a/dev-libs/popt/files/popt-1.15-interix.patch b/dev-libs/popt/files/popt-1.15-interix.patch |
| 280 |
deleted file mode 100644 |
| 281 |
index b8a048bdbc..0000000000 |
| 282 |
--- a/dev-libs/popt/files/popt-1.15-interix.patch |
| 283 |
+++ /dev/null |
| 284 |
@@ -1,17 +0,0 @@ |
| 285 |
---- popt.c 2009-04-12 21:14:38 +0300 |
| 286 |
-+++ popt.c 2009-09-29 17:51:19 +0300 |
| 287 |
-@@ -958,7 +958,14 @@ static int poptSaveArg(poptContext con, |
| 288 |
- unsigned int argInfo = poptArgInfo(con, opt); |
| 289 |
- |
| 290 |
- if (con->os->nextArg) { |
| 291 |
-+#ifdef __INTERIX |
| 292 |
-+/* interix only has strtol ... so long long not supported here! */ |
| 293 |
-+ if(opt->arg == POPT_ARG_LONGLONG) |
| 294 |
-+ return POPT_ERROR_BADNUMBER; |
| 295 |
-+ aNUM = strtol(con->os->nextArg, &end, 0); |
| 296 |
-+#else |
| 297 |
- aNUM = strtoll(con->os->nextArg, &end, 0); |
| 298 |
-+#endif |
| 299 |
- if (!(end && *end == '\0')) |
| 300 |
- return POPT_ERROR_BADNUMBER; |
| 301 |
- } |
| 302 |
|
| 303 |
diff --git a/dev-libs/popt/files/popt-1.15-mint.patch b/dev-libs/popt/files/popt-1.15-mint.patch |
| 304 |
deleted file mode 100644 |
| 305 |
index cff88a84e5..0000000000 |
| 306 |
--- a/dev-libs/popt/files/popt-1.15-mint.patch |
| 307 |
+++ /dev/null |
| 308 |
@@ -1,13 +0,0 @@ |
| 309 |
-http://bugs.gentoo.org/show_bug.cgi?id=287343 |
| 310 |
- |
| 311 |
---- poptconfig.c.old 2009-10-01 11:00:18.000000000 +0000 |
| 312 |
-+++ poptconfig.c 2009-10-01 11:00:52.000000000 +0000 |
| 313 |
-@@ -42,7 +42,7 @@ |
| 314 |
- /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ |
| 315 |
- #endif /* __LCLINT__ */ |
| 316 |
- |
| 317 |
--#if !defined(__GLIBC__) |
| 318 |
-+#if !defined(__GLIBC__) && !defined(__MINTLIB__) |
| 319 |
- /* Return nonzero if PATTERN contains any metacharacters. |
| 320 |
- Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ |
| 321 |
- static int |
| 322 |
|
| 323 |
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 |
| 324 |
deleted file mode 100644 |
| 325 |
index 7fc3e2f6c2..0000000000 |
| 326 |
--- a/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch |
| 327 |
+++ /dev/null |
| 328 |
@@ -1,47 +0,0 @@ |
| 329 |
-http://rpm5.org/cvs/tktview?tn=93 |
| 330 |
- |
| 331 |
---- configure.ac |
| 332 |
-+++ configure.ac |
| 333 |
-#@@ -82,7 +82,7 @@ |
| 334 |
- AC_CHECK_FUNC(setreuid, [], [ |
| 335 |
- AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) |
| 336 |
- ]) |
| 337 |
--AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom) |
| 338 |
-+AC_CHECK_FUNCS(getuid geteuid glob_pattern_p iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom) |
| 339 |
- |
| 340 |
- AM_GNU_GETTEXT([external]) |
| 341 |
- AM_ICONV_LINK |
| 342 |
---- config.h.in |
| 343 |
-+++ config.h.in |
| 344 |
-@@ -34,6 +34,9 @@ |
| 345 |
- /* Define to 1 if you have the `getuid' function. */ |
| 346 |
- #undef HAVE_GETUID |
| 347 |
- |
| 348 |
-+/* Define to 1 if you have the `glob_pattern_p' function. */ |
| 349 |
-+#undef HAVE_GLOB_PATTERN_P |
| 350 |
-+ |
| 351 |
- /* Define to 1 if you have the <glob.h> header file. */ |
| 352 |
- #undef HAVE_GLOB_H |
| 353 |
- |
| 354 |
---- configure |
| 355 |
-+++ configure |
| 356 |
-@@ -13505,7 +13505,7 @@ |
| 357 |
- |
| 358 |
- |
| 359 |
- |
| 360 |
--for ac_func in getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom |
| 361 |
-+for ac_func in getuid geteuid glob_pattern_p iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom |
| 362 |
- do |
| 363 |
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
| 364 |
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 |
| 365 |
---- poptconfig.c |
| 366 |
-+++ poptconfig.c |
| 367 |
-@@ -42,7 +42,7 @@ |
| 368 |
- /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ |
| 369 |
- #endif /* __LCLINT__ */ |
| 370 |
- |
| 371 |
--#if !defined(__GLIBC__) |
| 372 |
-+#if !defined(HAVE_GLOB_PATTERN_P) |
| 373 |
- /* Return nonzero if PATTERN contains any metacharacters. |
| 374 |
- Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ |
| 375 |
- static int |
| 376 |
|
| 377 |
diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml |
| 378 |
deleted file mode 100644 |
| 379 |
index 3e60a9a347..0000000000 |
| 380 |
--- a/dev-libs/popt/metadata.xml |
| 381 |
+++ /dev/null |
| 382 |
@@ -1,8 +0,0 @@ |
| 383 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 384 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 385 |
-<pkgmetadata> |
| 386 |
- <maintainer type="project"> |
| 387 |
- <email>base-system@g.o</email> |
| 388 |
- <name>Gentoo Base System</name> |
| 389 |
- </maintainer> |
| 390 |
-</pkgmetadata> |
| 391 |
|
| 392 |
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild |
| 393 |
deleted file mode 100644 |
| 394 |
index f35ad620a7..0000000000 |
| 395 |
--- a/dev-libs/popt/popt-1.16-r2.ebuild |
| 396 |
+++ /dev/null |
| 397 |
@@ -1,41 +0,0 @@ |
| 398 |
-# Copyright 1999-2019 Gentoo Authors |
| 399 |
-# Distributed under the terms of the GNU General Public License v2 |
| 400 |
- |
| 401 |
-EAPI=5 |
| 402 |
-inherit eutils multilib-minimal libtool |
| 403 |
- |
| 404 |
-DESCRIPTION="Parse Options - Command line parser" |
| 405 |
-HOMEPAGE="http://rpm5.org/" |
| 406 |
-SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz" |
| 407 |
- |
| 408 |
-LICENSE="MIT" |
| 409 |
-SLOT="0" |
| 410 |
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 411 |
-IUSE="nls static-libs" |
| 412 |
- |
| 413 |
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
| 414 |
- virtual/libiconv" |
| 415 |
-DEPEND="nls? ( sys-devel/gettext ) |
| 416 |
- virtual/libiconv" |
| 417 |
- |
| 418 |
-src_prepare() { |
| 419 |
- epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558 |
| 420 |
- sed -i -e 's:lt-test1:test1:' testit.sh || die |
| 421 |
- |
| 422 |
- epatch "${FILESDIR}"/${PN}-1.16-glob_pattern_p.patch # for MiNT and Cygwin |
| 423 |
- epatch "${FILESDIR}"/${PN}-1.13-no-wchar-hack.patch # for Interix and MiNT |
| 424 |
- elibtoolize # for FreeMiNT |
| 425 |
-} |
| 426 |
- |
| 427 |
-multilib_src_configure() { |
| 428 |
- ECONF_SOURCE=${S} \ |
| 429 |
- econf \ |
| 430 |
- --disable-dependency-tracking \ |
| 431 |
- $(use_enable static-libs static) \ |
| 432 |
- $(use_enable nls) |
| 433 |
-} |
| 434 |
- |
| 435 |
-multilib_src_install_all() { |
| 436 |
- dodoc CHANGES README |
| 437 |
- prune_libtool_files --all |
| 438 |
-} |
Archives