From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-libs/libxslt/Manifest | 14 ++ .../libxslt/files/1.1.30-unbreak-xslt-config.patch | 37 +++ .../libxslt-1.1.28-disable-static-modules.patch | 33 +++ .../files/libxslt-1.1.28-simplify-python.patch | 250 +++++++++++++++++++++ dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch | 29 +++ .../files/libxslt-1.1.30-simplify-python.patch | 250 +++++++++++++++++++++ .../libxslt/files/libxslt.m4-libxslt-1.1.26.patch | 38 ++++ dev-libs/libxslt/libxslt-1.1.29-r1.ebuild | 130 +++++++++++ dev-libs/libxslt/libxslt-1.1.30-r1.ebuild | 133 +++++++++++ dev-libs/libxslt/libxslt-1.1.30.ebuild | 129 +++++++++++ dev-libs/libxslt/metadata.xml | 8 + 11 files changed, 1051 insertions(+) create mode 100644 dev-libs/libxslt/Manifest create mode 100644 dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch create mode 100644 dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch create mode 100644 dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch create mode 100644 dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch create mode 100644 dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch create mode 100644 dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch create mode 100644 dev-libs/libxslt/libxslt-1.1.29-r1.ebuild create mode 100644 dev-libs/libxslt/libxslt-1.1.30-r1.ebuild create mode 100644 dev-libs/libxslt/libxslt-1.1.30.ebuild create mode 100644 dev-libs/libxslt/metadata.xml (limited to 'dev-libs/libxslt') diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest new file mode 100644 index 000000000000..8ae5c0a98529 --- /dev/null +++ b/dev-libs/libxslt/Manifest @@ -0,0 +1,14 @@ +AUX 1.1.30-unbreak-xslt-config.patch 791 SHA256 e7b85942dae4da41ac1ae20d9b335b57e3c613c9b06d351ad15ab8440b76543e SHA512 0bf8365043d183062b92e158a972d616e7c4744f5282f807f430862f8f831a1afbff793665754e2aedb438ee2ebb01d4526aec10573cef6f6e79d67c218c1ba2 WHIRLPOOL 84420f0f3333c751dbc0cf312dc8fffc35d3f4526538fa3a5f4079a195e51746a915eec782946374b451f444ced644cc1efd32678de5b3034da42e1673b43aef +AUX libxslt-1.1.28-disable-static-modules.patch 1109 SHA256 706fab8fb584bc6ce2452423847d0484b9499455cf63a492a6d39d0f649048fb SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1 WHIRLPOOL 1dd8eee2fb5d47baefde89d73912f1416c76b6224a1326fecbaafd6060002d8c842346d29ca8b2dd7d8e59c136509760b5ec353e4735cefb337cbc91eb2cc2e4 +AUX libxslt-1.1.28-simplify-python.patch 7468 SHA256 a06baa32549f17ed0595404125c8d3347d153b51beac37a34551390457c56737 SHA512 434000c035fe5427dd3d63fcb717f5e2b8863ed734d5451d54092b21ce5074b137299378c03d5130e18064d89be4ae942702eb8bc3295bd39287f353655c47c4 WHIRLPOOL 8a2079ddd6c5dc3c7e2b8adbe00ff65382a23aa0d91c36b68484575488068e847475f569811f4b612656d1f77ff7a1eb3242267a03b6c9a5b1c1d1b98e6b726a +AUX libxslt-1.1.29-cygwin.patch 1148 SHA256 f0b3271faf0a7bd201964642d6b018e2909d20dd356dd13c08fc9fbe6757dc58 SHA512 9d24169d749356b6887bdd6c3dc3d4b34c455569fc79bd7235cea7d9e1ee3114b135ca79ac6f4b8c3ad2cf467c119316d8c934bb27c9d041312d0b0a19b635e8 WHIRLPOOL cec857824be7fc7d39093892c1f6411a8219bb0698931e9df709a5582d36a56a72db9374fc033f0f54648bc19265a885e4b96583ce002786079d68ddf6a4cdf2 +AUX libxslt-1.1.30-simplify-python.patch 7487 SHA256 899c40e3fcf5cd45f6dbf56154ff81b7dffc60a20d1a725751e3d49da7f318bc SHA512 4b0b622aff880de8ca2fbdd9e61cbea117f1f497767caabcc4ab4e6532145683b08d127f497bdd41035dc7b3fa6d3ab5b53c2d8674e87f5193c652858ee31586 WHIRLPOOL 69201905f868669bcd9b4810d4ab601431136cc8607c06f377ea3576ae95ba37a49123e40bd8d426ab1e7e685d737a3d1043533ab6db1a1a11c0d55c2243ce32 +AUX libxslt.m4-libxslt-1.1.26.patch 1421 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a WHIRLPOOL 0b4da6d1ce77e653a6c175fc203f5fecd0c831a018a5063e66e5ff0cc19d9a19d8938b06e4318938a35f665f91442290f267bb3fc86b9268c2455ac9616caeff +DIST libxslt-1.1.29.tar.gz 3428524 SHA256 b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31 WHIRLPOOL 874dca166a147e3928207b0dea720b92a3657406363536be0cc3c904dcea7bad0af48536a722d1570743908a7e730073a13440f41885b8fbaeba919b1e99521b +DIST libxslt-1.1.30.tar.gz 3444029 SHA256 ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 WHIRLPOOL 7a346a1cdd340f6ee39b4d8d426dd894164ce4b8c55ee74b832cdcc9e7bb7bd2e13fdabb57a50a206c40be8bf238a57132bd1cf6fe48e77c710d8ec75f1aaffc +EBUILD libxslt-1.1.29-r1.ebuild 3496 SHA256 646933711df2c10425193358e01f4a2277c1e537a8b3d0091e3f8e92ea118733 SHA512 8881813ff55064e4d37308de04fa30750a54bcc3c0c932954d0930542435241b84f6300655eaf715c2e784086ef6cc400bfa5cf0f5ba256edc38c13d06fea372 WHIRLPOOL 74ae64d1646874adcfab060728c4b13e9482c5a8982d198548dbd624efc02ec857d5498e2fc731dead0e09b33294c77adfd2797b706bd791131d96363553f40a +EBUILD libxslt-1.1.30-r1.ebuild 3570 SHA256 34e5f78b59d8c0e0215169c99635bdf4524f7a0b4dca5ecebf10a35f3b582b98 SHA512 7899c43b5a0c4933cf44dd583e3c67f34a369a3e7909458545e3c63bc67c36a46389877583e35720ad384014668e5d336ca36eaa105523e1e8643328d8f19bad WHIRLPOOL 7fdabda4d6230f26c62856030957fc41252c01e14dce6552ebea4497c82044e64daf6cb2d9b1e863113d9054eae7ea299f10bbd2fad363d4a20a184e3701237c +EBUILD libxslt-1.1.30.ebuild 3461 SHA256 39915675e1deb05a107e8d90aa38e5cf68701dfe657406309b5663d69f17071b SHA512 b44d3c1f72cfded5bbdbd2ac0de4bec9b5d51945e9697f5fe7d71c01a507e005b77828312634e4095e9433e733a5ede58f4b822e0b2ef34027a3cd6e66542fc0 WHIRLPOOL adde0aa2a69d73c878c18073d15194e6b6f25247371aeff0a434325879f205141c436782832e4c801ca8bace4d1dfa4fe7d08b8201a10d70e6fbf5328aafee37 +MISC ChangeLog 8365 SHA256 b65a2f465bb43a077d88e2d6a9b519f298b0c00ff5332f071fb30ae97509440f SHA512 d6e29b3b6c1fda15a020b17728315bf11b6c208ddd7415d4c107c5777307ed37e43864e9b1feb9772c5257cd5f1df90051fce85944308d9e0a1afcb3d0147664 WHIRLPOOL 13da17ac13ee9bdda67134a6bc9bcb7f6127ced0a8cd8c35ce7df0284f107c079733170915bd73620bffbc3754fd477d907bc120ba8e328e833362aaa4d56d34 +MISC ChangeLog-2015 38221 SHA256 3ac8ca41025991ec887baeb5ad276a1a6fcc5f5a9e0014a50a5ba7c9dae878ec SHA512 d7a28c1e8f8884ae84d5fe11fb150edaadeffb2a3b7e3453a9276a9eb3bda47d529f0b0064ff23a45bd648652b8d82a505fa6f6c358e47bd583f1df8018205cc WHIRLPOOL d0a81a32dd6cb3f975bf3e52cab952531bd5eed4e0460a35c1c2ba2fd950d2b2800ca4bf7db526123d846b7d6b440e8b57285f4e34e41fcdc14c3ad527c7714e +MISC metadata.xml 259 SHA256 6d16d32cce05219baff0d7aef9baf4f8f4622ba77a55e9bc5ae9b074ae8d4600 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc WHIRLPOOL dd2c856848fdc98df5a4ffca31b95078656373a87ccf2e44be410e7139f2980f3ebb0ae951e2e92fc46ce8e3a3ecefec169c3a15bbcceba69c1bd8224a8dd271 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 new file mode 100644 index 000000000000..6e367f976916 --- /dev/null +++ b/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch @@ -0,0 +1,37 @@ +From 9608d20739b36087f0e6865cc924769d3b286188 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Tue, 12 Sep 2017 23:44:35 +0200 +Subject: [PATCH] Move XML_CONFIG assignment to unbreak xslt-config + +Bug: https://bugs.gentoo.org/630784 +--- + configure.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index e6f649cd..49e6b6cf 100644 +--- a/configure.in ++++ b/configure.in +@@ -518,9 +518,6 @@ else + LIBXML_MANUAL_SEARCH=yes + fi + +-if test "x$LIBXML_MANUAL_SEARCH" != "xno" +-then +- + dnl + dnl where is xml2-config + dnl +@@ -534,6 +531,9 @@ else + AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) + fi + ++if test "x$LIBXML_MANUAL_SEARCH" != "xno" ++then ++ + dnl + dnl imported from libxml2, c.f. #77827 + dnl +-- +2.14.1 + diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch b/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch new file mode 100644 index 000000000000..b30a08406d31 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch @@ -0,0 +1,33 @@ +From 06c9dba42097b06a18c81bb54a8da8b2bfaf991d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 11 Nov 2015 20:01:14 +0100 +Subject: [PATCH 3/3] Disable static module for python module + +--- + python/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index cc13c62..62afd1b 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -27,6 +27,7 @@ python_PYTHON = libxslt.py + pyexec_LTLIBRARIES = libxsltmod.la + + libxsltmod_la_CPPFLAGS = \ ++ -shared \ + -I$(top_srcdir)/libxslt \ + -I$(top_srcdir) \ + -I$(top_srcdir)/libexslt \ +@@ -34,7 +35,7 @@ libxsltmod_la_CPPFLAGS = \ + libxsltmod_la_SOURCES = libxslt.c types.c + nodist_libxsltmod_la_SOURCES = libxslt-py.c + libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) +-libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version ++libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -shared + + libxslt.py: $(srcdir)/libxsl.py libxsltclass.py + cat $(srcdir)/libxsl.py libxsltclass.py > $@ +-- +2.6.3 + diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch new file mode 100644 index 000000000000..7cbaaf69e092 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch @@ -0,0 +1,250 @@ +From f8aeca1dca05c7053532c576add6ab4a472c5e4e Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 11 Nov 2015 17:49:07 +0100 +Subject: [PATCH] Simplify python setup in autoconf + +AM_PATH_PYTHON does most of the job without using pkg-config as expected +from the rest of the autoconf script. +--- + Makefile.am | 14 +++++-- + configure.in | 119 ++++++++++++++--------------------------------------- + python/Makefile.am | 28 ++++--------- + 3 files changed, 49 insertions(+), 112 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e357f19..c396913 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,9 +2,13 @@ SUBDIRS = \ + libxslt \ + libexslt \ + xsltproc \ +- doc \ +- $(PYTHON_SUBDIR) \ +- tests ++ doc ++ ++if WITH_PYTHON ++SUBDIRS += python ++endif ++ ++SUBDIRS += tests + + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests + +@@ -51,7 +55,9 @@ tests: dummy + @echo '## Running the regression test suite' + @(cd tests ; $(MAKE) tests) + @(cd xsltproc ; $(MAKE) tests) +- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) tests ; fi) ++if WITH_PYTHON ++ @(cd python ; $(MAKE) tests) ++endif + + valgrind: + @echo '## Running the regression tests under Valgrind' +diff --git a/configure.in b/configure.in +index e84ad4f..102c733 100644 +--- a/configure.in ++++ b/configure.in +@@ -291,90 +291,37 @@ dnl + dnl check for python + dnl + +-PYTHON_VERSION= +-PYTHON_INCLUDES= +-PYTHON_SITE_PACKAGES= +-pythondir= +-AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) +-if test "$with_python" != "no" ; then +- if test -x "$with_python/bin/python" +- then +- echo Found python in $with_python/bin/python +- PYTHON="$with_python/bin/python" +- else +- if test -x "$with_python" +- then +- echo Found python in $with_python +- PYTHON="$with_python" +- else +- if test -x "$PYTHON" +- then +- echo Found python in environment PYTHON=$PYTHON +- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` +- else +- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) +- fi +- fi +- fi +- if test "$PYTHON" != "" +- then +- echo "PYTHON is pointing at $PYTHON" +- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` +- echo Found Python version $PYTHON_VERSION +- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 +-except: print 0"` +- if test "$LIBXML2_PYTHON" = "1" +- then +- echo Found libxml2-python module +- else +- echo Warning: Missing libxml2-python +- fi +- fi +- if test "$PYTHON_VERSION" != "" +- then +- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ +- -d $with_python/lib/python$PYTHON_VERSION/site-packages +- then +- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- echo could not find python$PYTHON_VERSION/Python.h +- fi +- fi +- if test ! -d "$PYTHON_SITE_PACKAGES" +- then +- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` +- fi +- fi +- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` +- fi +- if test "$with_python" != "" +- then +- pythondir='$(PYTHON_SITE_PACKAGES)' +- else +- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- fi +-fi +-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") +-if test "$PYTHON_INCLUDES" != "" +-then +- PYTHON_SUBDIR=python +-else +- PYTHON_SUBDIR= +-fi +-AC_SUBST(pythondir) +-AC_SUBST(PYTHON_SUBDIR) +-AC_SUBST(PYTHON_LIBS) ++AC_ARG_WITH([python], ++ AS_HELP_STRING([--with-python], [Build Python bindings if found]) ++) ++ ++AS_IF([test "$with_python" = "yes"], ++ [AM_PATH_PYTHON ++ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no]) ++ AS_IF([test "$PYTHON_CONFIG" = "no"], ++ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])]) ++ AS_IF([test "$PYTHON_CONFIG" != "no"], ++ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags` ++ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` ++ PYTHON_LIBS=`$PYTHON_CONFIG --libs`], ++ [AC_MSG_ERROR([Missing python development files.])]) ++ AC_MSG_CHECKING([libxml2 module in $PYTHON]) ++ LIBXML2_PYTHON=`$PYTHON -c "import sys; ++try: ++ import libxml2 ++ sys.stdout.write('1') ++except: ++ sys.stdout.write('0')"` ++ AS_IF([test "$LIBXML2_PYTHON" = "1"], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no]) ++ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) ++ ]) ++ ++AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) ++AC_SUBST([PYTHON_CFLAGS]) ++AC_SUBST([PYTHON_LDFLAGS]) ++AC_SUBST([PYTHON_LIBS]) + + AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) + WITH_CRYPTO=0 +@@ -644,10 +591,6 @@ AC_SUBST(PYTHONSODV) + AC_SUBST(XML_CONFIG) + AC_SUBST(LIBXML_LIBS) + AC_SUBST(LIBXML_CFLAGS) +-AC_SUBST(PYTHON) +-AC_SUBST(PYTHON_VERSION) +-AC_SUBST(PYTHON_INCLUDES) +-AC_SUBST(PYTHON_SITE_PACKAGES) + + XSLT_LIBDIR='-L${libdir}' + XSLT_INCLUDEDIR='-I${includedir}' +diff --git a/python/Makefile.am b/python/Makefile.am +index fa58b78..3a5ecd6 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -5,9 +5,9 @@ SUBDIRS= . tests + + AM_CFLAGS = $(LIBXML_CFLAGS) + +-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) ++docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) + # libxsltclass.txt is generated +-DOCS = TODO ++dist_docs_DATA = TODO + + EXTRA_DIST = \ + libxslt.c \ +@@ -16,10 +16,7 @@ EXTRA_DIST = \ + libxml_wrap.h \ + libxslt_wrap.h \ + libxsl.py \ +- libxslt-python-api.xml \ +- $(DOCS) +- +-libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version ++ libxslt-python-api.xml + + if WITH_PYTHON + mylibs = \ +@@ -28,31 +25,22 @@ mylibs = \ + + all-local: libxslt.py + +-python_LTLIBRARIES = libxsltmod.la ++python_PYTHON = libxslt.py ++pyexec_LTLIBRARIES = libxsltmod.la + + libxsltmod_la_CPPFLAGS = \ +- -I$(PYTHON_INCLUDES) \ + -I$(top_srcdir)/libxslt \ + -I$(top_srcdir) \ +- -I../libexslt ++ -I$(top_srcdir)/libexslt \ ++ $(PYTHON_CFLAGS) + libxsltmod_la_SOURCES = libxslt.c types.c + nodist_libxsltmod_la_SOURCES = libxslt-py.c + libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) ++libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version + + libxslt.py: $(srcdir)/libxsl.py libxsltclass.py + cat $(srcdir)/libxsl.py libxsltclass.py > $@ + +-install-data-local: +- $(MKDIR_P) $(DESTDIR)$(pythondir) +- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir) +- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR) +- @(for doc in $(DOCS) ; \ +- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done) +- +-uninstall-local: +- rm -f $(DESTDIR)$(pythondir)/libxslt.py +- rm -rf $(DESTDIR)$(DOCS_DIR) +- + GENERATE = generator.py + API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml + GENERATED= libxsltclass.py \ +-- +2.6.3 + diff --git a/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch b/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch new file mode 100644 index 000000000000..221da9a55da0 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch @@ -0,0 +1,29 @@ +From 2fbf5b1f440534a46b7b440a487768620cfb039c Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner +Date: Wed, 13 Jul 2016 13:31:05 +0200 +Subject: Add WIN32_EXTRA_LDFLAGS to tests/plugins/Makefile.am + +Fixes a compilation problem with Cygwin. + +Fixes bug #766669: +https://bugzilla.gnome.org/show_bug.cgi?id=766669 +--- + tests/plugins/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am +index e0736ab..0f8c378 100644 +--- a/tests/plugins/Makefile.am ++++ b/tests/plugins/Makefile.am +@@ -21,7 +21,7 @@ plugindir = $(abs_builddir)/.libs + xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) + xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c + xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) +-xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) ++xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) + + test-logall: + @echo '## Running plugin tests' +-- +cgit v0.12 + 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 new file mode 100644 index 000000000000..dac84fa66308 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch @@ -0,0 +1,250 @@ +From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 11 Nov 2015 17:49:07 +0100 +Subject: [PATCH] Simplify python setup in autoconf + +AM_PATH_PYTHON does most of the job without using pkg-config as expected +from the rest of the autoconf script. +--- + Makefile.am | 14 +++++-- + configure.in | 119 ++++++++++++++--------------------------------------- + python/Makefile.am | 28 ++++--------- + 3 files changed, 49 insertions(+), 112 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ff10f574..65decb3c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,9 +2,13 @@ SUBDIRS = \ + libxslt \ + libexslt \ + xsltproc \ +- doc \ +- $(PYTHON_SUBDIR) \ +- tests ++ doc ++ ++if WITH_PYTHON ++SUBDIRS += python ++endif ++ ++SUBDIRS += tests + + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests + +@@ -51,7 +55,9 @@ tests: dummy + @echo '## Running the regression test suite' + @(cd tests ; $(MAKE) -s tests) + @(cd xsltproc ; $(MAKE) -s tests) +- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi) ++if WITH_PYTHON ++ @(cd python ; $(MAKE) -s tests) ++endif + + valgrind: + @echo '## Running the regression tests under Valgrind' +diff --git a/configure.in b/configure.in +index d6aa3664..0a538944 100644 +--- a/configure.in ++++ b/configure.in +@@ -293,90 +293,37 @@ dnl + dnl check for python + dnl + +-PYTHON_VERSION= +-PYTHON_INCLUDES= +-PYTHON_SITE_PACKAGES= +-pythondir= +-AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) +-if test "$with_python" != "no" ; then +- if test -x "$with_python/bin/python" +- then +- echo Found python in $with_python/bin/python +- PYTHON="$with_python/bin/python" +- else +- if test -x "$with_python" +- then +- echo Found python in $with_python +- PYTHON="$with_python" +- else +- if test -x "$PYTHON" +- then +- echo Found python in environment PYTHON=$PYTHON +- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` +- else +- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) +- fi +- fi +- fi +- if test "$PYTHON" != "" +- then +- echo "PYTHON is pointing at $PYTHON" +- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` +- echo Found Python version $PYTHON_VERSION +- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 +-except: print 0"` +- if test "$LIBXML2_PYTHON" = "1" +- then +- echo Found libxml2-python module +- else +- echo Warning: Missing libxml2-python +- fi +- fi +- if test "$PYTHON_VERSION" != "" +- then +- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ +- -d $with_python/lib/python$PYTHON_VERSION/site-packages +- then +- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- else +- echo could not find python$PYTHON_VERSION/Python.h +- fi +- fi +- if test ! -d "$PYTHON_SITE_PACKAGES" +- then +- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` +- fi +- fi +- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` +- fi +- if test "$with_python" != "" +- then +- pythondir='$(PYTHON_SITE_PACKAGES)' +- else +- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- fi +-fi +-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") +-if test "$PYTHON_INCLUDES" != "" +-then +- PYTHON_SUBDIR=python +-else +- PYTHON_SUBDIR= +-fi +-AC_SUBST(pythondir) +-AC_SUBST(PYTHON_SUBDIR) +-AC_SUBST(PYTHON_LIBS) ++AC_ARG_WITH([python], ++ AS_HELP_STRING([--with-python], [Build Python bindings if found]) ++) ++ ++AS_IF([test "$with_python" = "yes"], ++ [AM_PATH_PYTHON ++ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no]) ++ AS_IF([test "$PYTHON_CONFIG" = "no"], ++ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])]) ++ AS_IF([test "$PYTHON_CONFIG" != "no"], ++ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags` ++ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` ++ PYTHON_LIBS=`$PYTHON_CONFIG --libs`], ++ [AC_MSG_ERROR([Missing python development files.])]) ++ AC_MSG_CHECKING([libxml2 module in $PYTHON]) ++ LIBXML2_PYTHON=`$PYTHON -c "import sys; ++try: ++ import libxml2 ++ sys.stdout.write('1') ++except: ++ sys.stdout.write('0')"` ++ AS_IF([test "$LIBXML2_PYTHON" = "1"], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no]) ++ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) ++ ]) ++ ++AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) ++AC_SUBST([PYTHON_CFLAGS]) ++AC_SUBST([PYTHON_LDFLAGS]) ++AC_SUBST([PYTHON_LIBS]) + + AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) + WITH_CRYPTO=0 +@@ -678,10 +625,6 @@ AC_SUBST(PYTHONSODV) + AC_SUBST(XML_CONFIG) + AC_SUBST(LIBXML_LIBS) + AC_SUBST(LIBXML_CFLAGS) +-AC_SUBST(PYTHON) +-AC_SUBST(PYTHON_VERSION) +-AC_SUBST(PYTHON_INCLUDES) +-AC_SUBST(PYTHON_SITE_PACKAGES) + + XSLT_LIBDIR='-L${libdir}' + XSLT_INCLUDEDIR='-I${includedir}' +diff --git a/python/Makefile.am b/python/Makefile.am +index fa58b78f..3a5ecd6a 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -5,9 +5,9 @@ SUBDIRS= . tests + + AM_CFLAGS = $(LIBXML_CFLAGS) + +-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) ++docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) + # libxsltclass.txt is generated +-DOCS = TODO ++dist_docs_DATA = TODO + + EXTRA_DIST = \ + libxslt.c \ +@@ -16,10 +16,7 @@ EXTRA_DIST = \ + libxml_wrap.h \ + libxslt_wrap.h \ + libxsl.py \ +- libxslt-python-api.xml \ +- $(DOCS) +- +-libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version ++ libxslt-python-api.xml + + if WITH_PYTHON + mylibs = \ +@@ -28,31 +25,22 @@ mylibs = \ + + all-local: libxslt.py + +-python_LTLIBRARIES = libxsltmod.la ++python_PYTHON = libxslt.py ++pyexec_LTLIBRARIES = libxsltmod.la + + libxsltmod_la_CPPFLAGS = \ +- -I$(PYTHON_INCLUDES) \ + -I$(top_srcdir)/libxslt \ + -I$(top_srcdir) \ +- -I../libexslt ++ -I$(top_srcdir)/libexslt \ ++ $(PYTHON_CFLAGS) + libxsltmod_la_SOURCES = libxslt.c types.c + nodist_libxsltmod_la_SOURCES = libxslt-py.c + libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) ++libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version + + libxslt.py: $(srcdir)/libxsl.py libxsltclass.py + cat $(srcdir)/libxsl.py libxsltclass.py > $@ + +-install-data-local: +- $(MKDIR_P) $(DESTDIR)$(pythondir) +- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir) +- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR) +- @(for doc in $(DOCS) ; \ +- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done) +- +-uninstall-local: +- rm -f $(DESTDIR)$(pythondir)/libxslt.py +- rm -rf $(DESTDIR)$(DOCS_DIR) +- + GENERATE = generator.py + API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml + GENERATED= libxsltclass.py \ +-- +2.14.1 + 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 new file mode 100644 index 000000000000..d6aaae4e9df0 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch @@ -0,0 +1,38 @@ +diff -ur libxslt-1.1.26.orig/libxslt.m4 libxslt-1.1.26/libxslt.m4 +--- libxslt-1.1.26.orig/libxslt.m4 2009-05-12 09:29:34.000000000 +0300 ++++ libxslt-1.1.26/libxslt.m4 2009-10-07 17:03:04.000000000 +0300 +@@ -52,8 +52,10 @@ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_xslttest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" ++ ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $XSLT_CFLAGS" ++ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" + LIBS="$XSLT_LIBS $LIBS" + dnl + dnl Now check if the installed libxslt is sufficiently new. +@@ -138,6 +140,7 @@ + } + ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi +@@ -158,6 +161,7 @@ + else + echo "*** Could not run libxslt test program, checking why..." + CFLAGS="$CFLAGS $XSLT_CFLAGS" ++ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" + LIBS="$LIBS $XSLT_LIBS" + AC_TRY_LINK([ + #include +@@ -177,6 +181,7 @@ + echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you" + echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi diff --git a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild new file mode 100644 index 000000000000..ef56e81eb165 --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml" + +inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="crypt debug examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # https://bugzilla.gnome.org/show_bug.cgi?id=684621 + eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch + # https://bugzilla.gnome.org/show_bug.cgi?id=766669 + eapply "${FILESDIR}"/${PN}-1.1.29-cygwin.patch + + # Simplify python setup + eapply "${FILESDIR}"/${PN}-1.1.28-simplify-python.patch + eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch + + mv configure.{in,ac} || die + + eautoreconf + # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary + # and it is propably otherwise too if upstream generated with new + # autoconf +# epunt_cxx + # But Prefix always needs elibtoolize if not eautoreconf'd. +# elibtoolize +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" + } + + libxslt_py_configure() { + mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist + run_in_build_dir libxslt_configure --with-python + } + + libxslt_configure --without-python # build python bindings separately + + if multilib_is_native_abi && use python; then + python_foreach_impl libxslt_py_configure + fi +} + +multilib_src_compile() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake all +} + +multilib_src_test() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake test +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + libxslt_foreach_py_emake \ + DESTDIR="${D}" \ + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ + EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ + install + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples + fi + + prune_libtool_files --modules +} + +libxslt_foreach_py_emake() { + libxslt_py_emake() { + pushd "${BUILD_DIR}/python" > /dev/null || die + emake "$@" + popd > /dev/null + } + local native_builddir=${BUILD_DIR} + python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" +} diff --git a/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild new file mode 100644 index 000000000000..739f5be1305e --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml" + +inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="crypt debug examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # https://bugzilla.gnome.org/show_bug.cgi?id=684621 + eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch + + # Simplify python setup + # https://bugzilla.gnome.org/show_bug.cgi?id=758095 + eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch + eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch + + # Fix xslt-config + # https://bugs.gentoo.org/630784 + eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch + + mv configure.{in,ac} || die + + eautoreconf + # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary + # and it is propably otherwise too if upstream generated with new + # autoconf +# epunt_cxx + # But Prefix always needs elibtoolize if not eautoreconf'd. +# elibtoolize +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" + } + + libxslt_py_configure() { + mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist + run_in_build_dir libxslt_configure --with-python + } + + libxslt_configure --without-python # build python bindings separately + + if multilib_is_native_abi && use python; then + python_foreach_impl libxslt_py_configure + fi +} + +multilib_src_compile() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake all +} + +multilib_src_test() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake test +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + libxslt_foreach_py_emake \ + DESTDIR="${D}" \ + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ + EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ + install + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples + fi + + prune_libtool_files --modules +} + +libxslt_foreach_py_emake() { + libxslt_py_emake() { + pushd "${BUILD_DIR}/python" > /dev/null || die + emake "$@" + popd > /dev/null + } + local native_builddir=${BUILD_DIR} + python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" +} diff --git a/dev-libs/libxslt/libxslt-1.1.30.ebuild b/dev-libs/libxslt/libxslt-1.1.30.ebuild new file mode 100644 index 000000000000..c6c711bde4c3 --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.30.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml" + +inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="crypt debug examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # https://bugzilla.gnome.org/show_bug.cgi?id=684621 + eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch + + # Simplify python setup + # https://bugzilla.gnome.org/show_bug.cgi?id=758095 + eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch + eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch + + mv configure.{in,ac} || die + + eautoreconf + # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary + # and it is propably otherwise too if upstream generated with new + # autoconf +# epunt_cxx + # But Prefix always needs elibtoolize if not eautoreconf'd. +# elibtoolize +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" + } + + libxslt_py_configure() { + mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist + run_in_build_dir libxslt_configure --with-python + } + + libxslt_configure --without-python # build python bindings separately + + if multilib_is_native_abi && use python; then + python_foreach_impl libxslt_py_configure + fi +} + +multilib_src_compile() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake all +} + +multilib_src_test() { + default + multilib_is_native_abi && use python && libxslt_foreach_py_emake test +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + libxslt_foreach_py_emake \ + DESTDIR="${D}" \ + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ + EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ + install + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples + fi + + prune_libtool_files --modules +} + +libxslt_foreach_py_emake() { + libxslt_py_emake() { + pushd "${BUILD_DIR}/python" > /dev/null || die + emake "$@" + popd > /dev/null + } + local native_builddir=${BUILD_DIR} + python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" +} diff --git a/dev-libs/libxslt/metadata.xml b/dev-libs/libxslt/metadata.xml new file mode 100644 index 000000000000..4cbddcaa19ad --- /dev/null +++ b/dev-libs/libxslt/metadata.xml @@ -0,0 +1,8 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + -- cgit v1.2.3