| 1 |
commit: 5dcc0568c5c84cf68534c76ae3182b6b5a112bf0 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 16 21:52:06 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 16 23:20:37 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dcc0568 |
| 7 |
|
| 8 |
dev-libs/libxslt: remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
dev-libs/libxslt/Manifest | 1 - |
| 13 |
.../libxslt/files/1.1.30-unbreak-xslt-config.patch | 37 --- |
| 14 |
.../libxslt/files/libxslt-1.1.30-glibc226.patch | 32 --- |
| 15 |
.../files/libxslt-1.1.30-simplify-python.patch | 250 --------------------- |
| 16 |
.../libxslt/files/libxslt.m4-libxslt-1.1.26.patch | 38 ---- |
| 17 |
dev-libs/libxslt/libxslt-1.1.30-r2.ebuild | 136 ----------- |
| 18 |
6 files changed, 494 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest |
| 21 |
index 82223dbe0fd..50121a97439 100644 |
| 22 |
--- a/dev-libs/libxslt/Manifest |
| 23 |
+++ b/dev-libs/libxslt/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 |
| 26 |
DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed8836f573adba4b5f0e3f2e1410acfca0c50dbe06ea3b50a2df819aa01e7522902fbd5270e5329075b854881150ab64 SHA512 e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39 |
| 27 |
|
| 28 |
diff --git a/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch b/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 6e367f97691..00000000000 |
| 31 |
--- a/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,37 +0,0 @@ |
| 34 |
-From 9608d20739b36087f0e6865cc924769d3b286188 Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Gilles Dartiguelongue <eva@g.o> |
| 36 |
-Date: Tue, 12 Sep 2017 23:44:35 +0200 |
| 37 |
-Subject: [PATCH] Move XML_CONFIG assignment to unbreak xslt-config |
| 38 |
- |
| 39 |
-Bug: https://bugs.gentoo.org/630784 |
| 40 |
---- |
| 41 |
- configure.in | 6 +++--- |
| 42 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
| 43 |
- |
| 44 |
-diff --git a/configure.in b/configure.in |
| 45 |
-index e6f649cd..49e6b6cf 100644 |
| 46 |
---- a/configure.in |
| 47 |
-+++ b/configure.in |
| 48 |
-@@ -518,9 +518,6 @@ else |
| 49 |
- LIBXML_MANUAL_SEARCH=yes |
| 50 |
- fi |
| 51 |
- |
| 52 |
--if test "x$LIBXML_MANUAL_SEARCH" != "xno" |
| 53 |
--then |
| 54 |
-- |
| 55 |
- dnl |
| 56 |
- dnl where is xml2-config |
| 57 |
- dnl |
| 58 |
-@@ -534,6 +531,9 @@ else |
| 59 |
- AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) |
| 60 |
- fi |
| 61 |
- |
| 62 |
-+if test "x$LIBXML_MANUAL_SEARCH" != "xno" |
| 63 |
-+then |
| 64 |
-+ |
| 65 |
- dnl |
| 66 |
- dnl imported from libxml2, c.f. #77827 |
| 67 |
- dnl |
| 68 |
--- |
| 69 |
-2.14.1 |
| 70 |
- |
| 71 |
|
| 72 |
diff --git a/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch b/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch |
| 73 |
deleted file mode 100644 |
| 74 |
index e1e97229d60..00000000000 |
| 75 |
--- a/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch |
| 76 |
+++ /dev/null |
| 77 |
@@ -1,32 +0,0 @@ |
| 78 |
-diff --git a/configure.in b/configure.in |
| 79 |
-index d6aa366..20aafb8 100644 |
| 80 |
---- a/configure.in |
| 81 |
-+++ b/configure.in |
| 82 |
-@@ -165,11 +165,11 @@ XSLT_LOCALE_XLOCALE=0 |
| 83 |
- XSLT_LOCALE_WINAPI=0 |
| 84 |
- |
| 85 |
- AC_CHECK_HEADERS([locale.h xlocale.h]) |
| 86 |
--if test $ac_cv_header_xlocale_h = yes; then |
| 87 |
-+if test $ac_cv_header_locale_h = yes; then |
| 88 |
- dnl |
| 89 |
- dnl Check for generic locale_t declaration |
| 90 |
- dnl |
| 91 |
--AC_MSG_CHECKING([if xlocale program link]) |
| 92 |
-+AC_MSG_CHECKING([if locale program link]) |
| 93 |
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
| 94 |
- #ifdef HAVE_LOCALE_H |
| 95 |
- #include <locale.h> |
| 96 |
-diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h |
| 97 |
-index 8a9ca15..2f64424 100644 |
| 98 |
---- a/libxslt/xsltlocale.h |
| 99 |
-+++ b/libxslt/xsltlocale.h |
| 100 |
-@@ -17,7 +17,9 @@ |
| 101 |
- #ifdef XSLT_LOCALE_XLOCALE |
| 102 |
- |
| 103 |
- #include <locale.h> |
| 104 |
-+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 26 |
| 105 |
- #include <xlocale.h> |
| 106 |
-+#endif |
| 107 |
- |
| 108 |
- #ifdef __GLIBC__ |
| 109 |
- /*locale_t is defined only if _GNU_SOURCE is defined*/ |
| 110 |
|
| 111 |
diff --git a/dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch |
| 112 |
deleted file mode 100644 |
| 113 |
index dac84fa6630..00000000000 |
| 114 |
--- a/dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,250 +0,0 @@ |
| 117 |
-From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001 |
| 118 |
-From: Gilles Dartiguelongue <eva@g.o> |
| 119 |
-Date: Wed, 11 Nov 2015 17:49:07 +0100 |
| 120 |
-Subject: [PATCH] Simplify python setup in autoconf |
| 121 |
- |
| 122 |
-AM_PATH_PYTHON does most of the job without using pkg-config as expected |
| 123 |
-from the rest of the autoconf script. |
| 124 |
---- |
| 125 |
- Makefile.am | 14 +++++-- |
| 126 |
- configure.in | 119 ++++++++++++++--------------------------------------- |
| 127 |
- python/Makefile.am | 28 ++++--------- |
| 128 |
- 3 files changed, 49 insertions(+), 112 deletions(-) |
| 129 |
- |
| 130 |
-diff --git a/Makefile.am b/Makefile.am |
| 131 |
-index ff10f574..65decb3c 100644 |
| 132 |
---- a/Makefile.am |
| 133 |
-+++ b/Makefile.am |
| 134 |
-@@ -2,9 +2,13 @@ SUBDIRS = \ |
| 135 |
- libxslt \ |
| 136 |
- libexslt \ |
| 137 |
- xsltproc \ |
| 138 |
-- doc \ |
| 139 |
-- $(PYTHON_SUBDIR) \ |
| 140 |
-- tests |
| 141 |
-+ doc |
| 142 |
-+ |
| 143 |
-+if WITH_PYTHON |
| 144 |
-+SUBDIRS += python |
| 145 |
-+endif |
| 146 |
-+ |
| 147 |
-+SUBDIRS += tests |
| 148 |
- |
| 149 |
- DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests |
| 150 |
- |
| 151 |
-@@ -51,7 +55,9 @@ tests: dummy |
| 152 |
- @echo '## Running the regression test suite' |
| 153 |
- @(cd tests ; $(MAKE) -s tests) |
| 154 |
- @(cd xsltproc ; $(MAKE) -s tests) |
| 155 |
-- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi) |
| 156 |
-+if WITH_PYTHON |
| 157 |
-+ @(cd python ; $(MAKE) -s tests) |
| 158 |
-+endif |
| 159 |
- |
| 160 |
- valgrind: |
| 161 |
- @echo '## Running the regression tests under Valgrind' |
| 162 |
-diff --git a/configure.in b/configure.in |
| 163 |
-index d6aa3664..0a538944 100644 |
| 164 |
---- a/configure.in |
| 165 |
-+++ b/configure.in |
| 166 |
-@@ -293,90 +293,37 @@ dnl |
| 167 |
- dnl check for python |
| 168 |
- dnl |
| 169 |
- |
| 170 |
--PYTHON_VERSION= |
| 171 |
--PYTHON_INCLUDES= |
| 172 |
--PYTHON_SITE_PACKAGES= |
| 173 |
--pythondir= |
| 174 |
--AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) |
| 175 |
--if test "$with_python" != "no" ; then |
| 176 |
-- if test -x "$with_python/bin/python" |
| 177 |
-- then |
| 178 |
-- echo Found python in $with_python/bin/python |
| 179 |
-- PYTHON="$with_python/bin/python" |
| 180 |
-- else |
| 181 |
-- if test -x "$with_python" |
| 182 |
-- then |
| 183 |
-- echo Found python in $with_python |
| 184 |
-- PYTHON="$with_python" |
| 185 |
-- else |
| 186 |
-- if test -x "$PYTHON" |
| 187 |
-- then |
| 188 |
-- echo Found python in environment PYTHON=$PYTHON |
| 189 |
-- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` |
| 190 |
-- else |
| 191 |
-- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) |
| 192 |
-- fi |
| 193 |
-- fi |
| 194 |
-- fi |
| 195 |
-- if test "$PYTHON" != "" |
| 196 |
-- then |
| 197 |
-- echo "PYTHON is pointing at $PYTHON" |
| 198 |
-- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` |
| 199 |
-- echo Found Python version $PYTHON_VERSION |
| 200 |
-- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 |
| 201 |
--except: print 0"` |
| 202 |
-- if test "$LIBXML2_PYTHON" = "1" |
| 203 |
-- then |
| 204 |
-- echo Found libxml2-python module |
| 205 |
-- else |
| 206 |
-- echo Warning: Missing libxml2-python |
| 207 |
-- fi |
| 208 |
-- fi |
| 209 |
-- if test "$PYTHON_VERSION" != "" |
| 210 |
-- then |
| 211 |
-- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ |
| 212 |
-- -d $with_python/lib/python$PYTHON_VERSION/site-packages |
| 213 |
-- then |
| 214 |
-- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION |
| 215 |
-- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
| 216 |
-- else |
| 217 |
-- if test -r $prefix/include/python$PYTHON_VERSION/Python.h |
| 218 |
-- then |
| 219 |
-- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION |
| 220 |
-- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
| 221 |
-- else |
| 222 |
-- if test -r /usr/include/python$PYTHON_VERSION/Python.h |
| 223 |
-- then |
| 224 |
-- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION |
| 225 |
-- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
| 226 |
-- else |
| 227 |
-- echo could not find python$PYTHON_VERSION/Python.h |
| 228 |
-- fi |
| 229 |
-- fi |
| 230 |
-- if test ! -d "$PYTHON_SITE_PACKAGES" |
| 231 |
-- then |
| 232 |
-- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` |
| 233 |
-- fi |
| 234 |
-- fi |
| 235 |
-- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` |
| 236 |
-- fi |
| 237 |
-- if test "$with_python" != "" |
| 238 |
-- then |
| 239 |
-- pythondir='$(PYTHON_SITE_PACKAGES)' |
| 240 |
-- else |
| 241 |
-- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
| 242 |
-- fi |
| 243 |
--fi |
| 244 |
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") |
| 245 |
--if test "$PYTHON_INCLUDES" != "" |
| 246 |
--then |
| 247 |
-- PYTHON_SUBDIR=python |
| 248 |
--else |
| 249 |
-- PYTHON_SUBDIR= |
| 250 |
--fi |
| 251 |
--AC_SUBST(pythondir) |
| 252 |
--AC_SUBST(PYTHON_SUBDIR) |
| 253 |
--AC_SUBST(PYTHON_LIBS) |
| 254 |
-+AC_ARG_WITH([python], |
| 255 |
-+ AS_HELP_STRING([--with-python], [Build Python bindings if found]) |
| 256 |
-+) |
| 257 |
-+ |
| 258 |
-+AS_IF([test "$with_python" = "yes"], |
| 259 |
-+ [AM_PATH_PYTHON |
| 260 |
-+ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no]) |
| 261 |
-+ AS_IF([test "$PYTHON_CONFIG" = "no"], |
| 262 |
-+ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])]) |
| 263 |
-+ AS_IF([test "$PYTHON_CONFIG" != "no"], |
| 264 |
-+ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags` |
| 265 |
-+ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` |
| 266 |
-+ PYTHON_LIBS=`$PYTHON_CONFIG --libs`], |
| 267 |
-+ [AC_MSG_ERROR([Missing python development files.])]) |
| 268 |
-+ AC_MSG_CHECKING([libxml2 module in $PYTHON]) |
| 269 |
-+ LIBXML2_PYTHON=`$PYTHON -c "import sys; |
| 270 |
-+try: |
| 271 |
-+ import libxml2 |
| 272 |
-+ sys.stdout.write('1') |
| 273 |
-+except: |
| 274 |
-+ sys.stdout.write('0')"` |
| 275 |
-+ AS_IF([test "$LIBXML2_PYTHON" = "1"], |
| 276 |
-+ [AC_MSG_RESULT([yes])], |
| 277 |
-+ [AC_MSG_RESULT([no]) |
| 278 |
-+ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) |
| 279 |
-+ ]) |
| 280 |
-+ |
| 281 |
-+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) |
| 282 |
-+AC_SUBST([PYTHON_CFLAGS]) |
| 283 |
-+AC_SUBST([PYTHON_LDFLAGS]) |
| 284 |
-+AC_SUBST([PYTHON_LIBS]) |
| 285 |
- |
| 286 |
- AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) |
| 287 |
- WITH_CRYPTO=0 |
| 288 |
-@@ -678,10 +625,6 @@ AC_SUBST(PYTHONSODV) |
| 289 |
- AC_SUBST(XML_CONFIG) |
| 290 |
- AC_SUBST(LIBXML_LIBS) |
| 291 |
- AC_SUBST(LIBXML_CFLAGS) |
| 292 |
--AC_SUBST(PYTHON) |
| 293 |
--AC_SUBST(PYTHON_VERSION) |
| 294 |
--AC_SUBST(PYTHON_INCLUDES) |
| 295 |
--AC_SUBST(PYTHON_SITE_PACKAGES) |
| 296 |
- |
| 297 |
- XSLT_LIBDIR='-L${libdir}' |
| 298 |
- XSLT_INCLUDEDIR='-I${includedir}' |
| 299 |
-diff --git a/python/Makefile.am b/python/Makefile.am |
| 300 |
-index fa58b78f..3a5ecd6a 100644 |
| 301 |
---- a/python/Makefile.am |
| 302 |
-+++ b/python/Makefile.am |
| 303 |
-@@ -5,9 +5,9 @@ SUBDIRS= . tests |
| 304 |
- |
| 305 |
- AM_CFLAGS = $(LIBXML_CFLAGS) |
| 306 |
- |
| 307 |
--DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) |
| 308 |
-+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) |
| 309 |
- # libxsltclass.txt is generated |
| 310 |
--DOCS = TODO |
| 311 |
-+dist_docs_DATA = TODO |
| 312 |
- |
| 313 |
- EXTRA_DIST = \ |
| 314 |
- libxslt.c \ |
| 315 |
-@@ -16,10 +16,7 @@ EXTRA_DIST = \ |
| 316 |
- libxml_wrap.h \ |
| 317 |
- libxslt_wrap.h \ |
| 318 |
- libxsl.py \ |
| 319 |
-- libxslt-python-api.xml \ |
| 320 |
-- $(DOCS) |
| 321 |
-- |
| 322 |
--libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version |
| 323 |
-+ libxslt-python-api.xml |
| 324 |
- |
| 325 |
- if WITH_PYTHON |
| 326 |
- mylibs = \ |
| 327 |
-@@ -28,31 +25,22 @@ mylibs = \ |
| 328 |
- |
| 329 |
- all-local: libxslt.py |
| 330 |
- |
| 331 |
--python_LTLIBRARIES = libxsltmod.la |
| 332 |
-+python_PYTHON = libxslt.py |
| 333 |
-+pyexec_LTLIBRARIES = libxsltmod.la |
| 334 |
- |
| 335 |
- libxsltmod_la_CPPFLAGS = \ |
| 336 |
-- -I$(PYTHON_INCLUDES) \ |
| 337 |
- -I$(top_srcdir)/libxslt \ |
| 338 |
- -I$(top_srcdir) \ |
| 339 |
-- -I../libexslt |
| 340 |
-+ -I$(top_srcdir)/libexslt \ |
| 341 |
-+ $(PYTHON_CFLAGS) |
| 342 |
- libxsltmod_la_SOURCES = libxslt.c types.c |
| 343 |
- nodist_libxsltmod_la_SOURCES = libxslt-py.c |
| 344 |
- libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) |
| 345 |
-+libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version |
| 346 |
- |
| 347 |
- libxslt.py: $(srcdir)/libxsl.py libxsltclass.py |
| 348 |
- cat $(srcdir)/libxsl.py libxsltclass.py > $@ |
| 349 |
- |
| 350 |
--install-data-local: |
| 351 |
-- $(MKDIR_P) $(DESTDIR)$(pythondir) |
| 352 |
-- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir) |
| 353 |
-- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR) |
| 354 |
-- @(for doc in $(DOCS) ; \ |
| 355 |
-- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done) |
| 356 |
-- |
| 357 |
--uninstall-local: |
| 358 |
-- rm -f $(DESTDIR)$(pythondir)/libxslt.py |
| 359 |
-- rm -rf $(DESTDIR)$(DOCS_DIR) |
| 360 |
-- |
| 361 |
- GENERATE = generator.py |
| 362 |
- API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml |
| 363 |
- GENERATED= libxsltclass.py \ |
| 364 |
--- |
| 365 |
-2.14.1 |
| 366 |
- |
| 367 |
|
| 368 |
diff --git a/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch b/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch |
| 369 |
deleted file mode 100644 |
| 370 |
index d6aaae4e9df..00000000000 |
| 371 |
--- a/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch |
| 372 |
+++ /dev/null |
| 373 |
@@ -1,38 +0,0 @@ |
| 374 |
-diff -ur libxslt-1.1.26.orig/libxslt.m4 libxslt-1.1.26/libxslt.m4 |
| 375 |
---- libxslt-1.1.26.orig/libxslt.m4 2009-05-12 09:29:34.000000000 +0300 |
| 376 |
-+++ libxslt-1.1.26/libxslt.m4 2009-10-07 17:03:04.000000000 +0300 |
| 377 |
-@@ -52,8 +52,10 @@ |
| 378 |
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
| 379 |
- if test "x$enable_xslttest" = "xyes" ; then |
| 380 |
- ac_save_CFLAGS="$CFLAGS" |
| 381 |
-+ ac_save_CXXFLAGS="$CXXFLAGS" |
| 382 |
- ac_save_LIBS="$LIBS" |
| 383 |
- CFLAGS="$CFLAGS $XSLT_CFLAGS" |
| 384 |
-+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" |
| 385 |
- LIBS="$XSLT_LIBS $LIBS" |
| 386 |
- dnl |
| 387 |
- dnl Now check if the installed libxslt is sufficiently new. |
| 388 |
-@@ -138,6 +140,7 @@ |
| 389 |
- } |
| 390 |
- ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) |
| 391 |
- CFLAGS="$ac_save_CFLAGS" |
| 392 |
-+ CXXFLAGS="$ac_save_CXXFLAGS" |
| 393 |
- LIBS="$ac_save_LIBS" |
| 394 |
- fi |
| 395 |
- fi |
| 396 |
-@@ -158,6 +161,7 @@ |
| 397 |
- else |
| 398 |
- echo "*** Could not run libxslt test program, checking why..." |
| 399 |
- CFLAGS="$CFLAGS $XSLT_CFLAGS" |
| 400 |
-+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" |
| 401 |
- LIBS="$LIBS $XSLT_LIBS" |
| 402 |
- AC_TRY_LINK([ |
| 403 |
- #include <libxslt/xslt.h> |
| 404 |
-@@ -177,6 +181,7 @@ |
| 405 |
- echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you" |
| 406 |
- echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ]) |
| 407 |
- CFLAGS="$ac_save_CFLAGS" |
| 408 |
-+ CXXFLAGS="$ac_save_CXXFLAGS" |
| 409 |
- LIBS="$ac_save_LIBS" |
| 410 |
- fi |
| 411 |
- fi |
| 412 |
|
| 413 |
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild |
| 414 |
deleted file mode 100644 |
| 415 |
index fa6a482f36c..00000000000 |
| 416 |
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild |
| 417 |
+++ /dev/null |
| 418 |
@@ -1,136 +0,0 @@ |
| 419 |
-# Copyright 1999-2018 Gentoo Foundation |
| 420 |
-# Distributed under the terms of the GNU General Public License v2 |
| 421 |
- |
| 422 |
-EAPI=6 |
| 423 |
-PYTHON_COMPAT=( python2_7 ) |
| 424 |
-PYTHON_REQ_USE="xml" |
| 425 |
- |
| 426 |
-inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal |
| 427 |
- |
| 428 |
-DESCRIPTION="XSLT libraries and tools" |
| 429 |
-HOMEPAGE="http://www.xmlsoft.org/" |
| 430 |
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" |
| 431 |
- |
| 432 |
-LICENSE="MIT" |
| 433 |
-SLOT="0" |
| 434 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 435 |
- |
| 436 |
-IUSE="crypt debug examples python static-libs elibc_Darwin" |
| 437 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 438 |
- |
| 439 |
-RDEPEND=" |
| 440 |
- >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}] |
| 441 |
- crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) |
| 442 |
- python? ( |
| 443 |
- ${PYTHON_DEPS} |
| 444 |
- dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) |
| 445 |
-" |
| 446 |
-DEPEND="${RDEPEND}" |
| 447 |
- |
| 448 |
-MULTILIB_CHOST_TOOLS=( |
| 449 |
- /usr/bin/xslt-config |
| 450 |
-) |
| 451 |
- |
| 452 |
-MULTILIB_WRAPPED_HEADERS=( |
| 453 |
- /usr/include/libxslt/xsltconfig.h |
| 454 |
-) |
| 455 |
- |
| 456 |
-src_prepare() { |
| 457 |
- default |
| 458 |
- |
| 459 |
- DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) |
| 460 |
- |
| 461 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=684621 |
| 462 |
- eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch |
| 463 |
- |
| 464 |
- # Simplify python setup |
| 465 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=758095 |
| 466 |
- eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch |
| 467 |
- eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch |
| 468 |
- |
| 469 |
- # Fix xslt-config |
| 470 |
- # https://bugs.gentoo.org/630784 |
| 471 |
- eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch |
| 472 |
- |
| 473 |
- # Fix build and headers with glibc-2.26, bug 632214, breaks Darwin |
| 474 |
- use elibc_Darwin || eapply "${FILESDIR}"/${PN}-1.1.30-glibc226.patch |
| 475 |
- |
| 476 |
- mv configure.{in,ac} || die |
| 477 |
- |
| 478 |
- eautoreconf |
| 479 |
- # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary |
| 480 |
- # and it is propably otherwise too if upstream generated with new |
| 481 |
- # autoconf |
| 482 |
-# epunt_cxx |
| 483 |
- # But Prefix always needs elibtoolize if not eautoreconf'd. |
| 484 |
-# elibtoolize |
| 485 |
-} |
| 486 |
- |
| 487 |
-multilib_src_configure() { |
| 488 |
- libxslt_configure() { |
| 489 |
- ECONF_SOURCE="${S}" econf \ |
| 490 |
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 491 |
- --with-html-subdir=html \ |
| 492 |
- $(use_with crypt crypto) \ |
| 493 |
- $(use_with debug) \ |
| 494 |
- $(use_with debug mem-debug) \ |
| 495 |
- $(use_enable static-libs static) \ |
| 496 |
- "$@" |
| 497 |
- } |
| 498 |
- |
| 499 |
- libxslt_py_configure() { |
| 500 |
- mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist |
| 501 |
- run_in_build_dir libxslt_configure --with-python |
| 502 |
- } |
| 503 |
- |
| 504 |
- libxslt_configure --without-python # build python bindings separately |
| 505 |
- |
| 506 |
- if multilib_is_native_abi && use python; then |
| 507 |
- python_foreach_impl libxslt_py_configure |
| 508 |
- fi |
| 509 |
-} |
| 510 |
- |
| 511 |
-multilib_src_compile() { |
| 512 |
- default |
| 513 |
- multilib_is_native_abi && use python && libxslt_foreach_py_emake all |
| 514 |
-} |
| 515 |
- |
| 516 |
-multilib_src_test() { |
| 517 |
- default |
| 518 |
- multilib_is_native_abi && use python && libxslt_foreach_py_emake test |
| 519 |
-} |
| 520 |
- |
| 521 |
-multilib_src_install() { |
| 522 |
- # "default" does not work here - docs are installed by multilib_src_install_all |
| 523 |
- emake DESTDIR="${D}" install |
| 524 |
- |
| 525 |
- if multilib_is_native_abi && use python; then |
| 526 |
- libxslt_foreach_py_emake \ |
| 527 |
- DESTDIR="${D}" \ |
| 528 |
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
| 529 |
- EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
| 530 |
- install |
| 531 |
- python_foreach_impl python_optimize |
| 532 |
- fi |
| 533 |
-} |
| 534 |
- |
| 535 |
-multilib_src_install_all() { |
| 536 |
- einstalldocs |
| 537 |
- |
| 538 |
- if ! use examples; then |
| 539 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
| 540 |
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
| 541 |
- fi |
| 542 |
- |
| 543 |
- prune_libtool_files --modules |
| 544 |
-} |
| 545 |
- |
| 546 |
-libxslt_foreach_py_emake() { |
| 547 |
- libxslt_py_emake() { |
| 548 |
- pushd "${BUILD_DIR}/python" > /dev/null || die |
| 549 |
- emake "$@" |
| 550 |
- popd > /dev/null |
| 551 |
- } |
| 552 |
- local native_builddir=${BUILD_DIR} |
| 553 |
- python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" |
| 554 |
-} |
Archives