diff options
Diffstat (limited to 'sci-misc')
-rw-r--r-- | sci-misc/Manifest.gz | bin | 2908 -> 2902 bytes | |||
-rw-r--r-- | sci-misc/apertium/Manifest | 5 | ||||
-rw-r--r-- | sci-misc/apertium/apertium-3.2.0.ebuild | 39 | ||||
-rw-r--r-- | sci-misc/apertium/files/apertium-3.2.0-autotools.patch | 81 | ||||
-rw-r--r-- | sci-misc/apertium/metadata.xml | 14 | ||||
-rw-r--r-- | sci-misc/h5utils/Manifest | 4 | ||||
-rw-r--r-- | sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch | 37 | ||||
-rw-r--r-- | sci-misc/h5utils/h5utils-1.13.1.ebuild | 2 |
8 files changed, 140 insertions, 42 deletions
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz Binary files differindex d03a4c887f97..1b058f23ce99 100644 --- a/sci-misc/Manifest.gz +++ b/sci-misc/Manifest.gz diff --git a/sci-misc/apertium/Manifest b/sci-misc/apertium/Manifest index 047de4499337..b912d1305878 100644 --- a/sci-misc/apertium/Manifest +++ b/sci-misc/apertium/Manifest @@ -1,6 +1,7 @@ AUX 3.2.0-datadir.patch 1315 BLAKE2B 011d2670fafed5ef1a891c39a6c6f084156f1f14a69e9d382318ddc4599318de516ba4fbacbda4d23e28b036b4483d2adc33be44b277cb9da067a66a4e07fb72 SHA512 51d4950ee82298a3b77a83e625c7bf788bdbc15b0fa16e1b5e0b57a8be1c28d5a499a1d3fa2436b7cdeedf397803b6ca6fe6740871b8c3a9687b57b3182f9e6a AUX 3.2.0-flags.patch 2163 BLAKE2B 213aa7a6cd5dd9c5e068f5bfe96d5dbe3640e6c231230a912996e705efbe37ba486e962da9b7b5473b8b38ed1861eee3d2f3565ca5a5764433792ab0264c4266 SHA512 25a1e8687c38091b249fbbef4dac01c95f4b446ad7e3ffd829b8803d056e34ec49057855af80f8ec578d83894234ab0c87b900daec759a6fd3ba8ae3fc736fce +AUX apertium-3.2.0-autotools.patch 3814 BLAKE2B b5e621bde3986220b2e624234e5a865d4ed4f114412aa8e822d587eb12f66f8549fc7b083b52340bea36f18001e42f8e32a034127ec43ff70f94674b821b853f SHA512 b5ff3fe8820aff1d7f10eb38ba5b921c87a780c6e146f316a43f8436facb1671b873d22a0b8cd9b0d7f1fda53db9db9b291cd0083d848d039a91aeeaf82d8b30 AUX apertium-3.2.0-libpcre.patch 1480 BLAKE2B 218a59978c694b1cbd4a6fcad2e80e0abf30be9f89f4f6180e6a94ff8a399ef7e60790b74a661866bef5dd09dfa7b0ed5cdb17027c2539659ca9eaaf816042eb SHA512 e8816e99ea2e2c0c027e498d77bf6948002f84781a3af77bb6cf570dfbf29a4a111b94abadfd4b8e4c35737c17abc51c89d880ee938a71fd7a2e57fe88ac081b DIST apertium-3.2.0.tar.gz 767311 BLAKE2B 03069a0839d0ad61db12aea977e0847b3093a46becd7c36e3bb7b483242986f8f1b4a94c6c64bdfc94f11d13353fbdb6835ff032158d9a05151342606fdd57a1 SHA512 ec80d72480e414eb9a169241d0921b21009dde7c1da9a773f500f16ac785741be1f4a221c25b3b32e7847405f76e93b5feadb6f541170c0742718e27dfa1fb25 -EBUILD apertium-3.2.0.ebuild 697 BLAKE2B a2af400d0183c3e0e9b199d7e7eefd6369e48db1481273f6ff5c105b0b25383e4b4ac70a1ceb5300971e589d0163aec89e6fe06f91089b757f4fb0cb83c5c4ef SHA512 c2a803fa2291a879acc95808a740228f06b0105134eecb93f2be103e0db964ada9e5e43e1acb7a7021c07f2d758fa3e4d8536c677616106d01c3eb5ba5179ade -MISC metadata.xml 341 BLAKE2B c0bab94633de05b652bc9b786ee5ab47f1110c69a67488dd51a45e995d13b9323957370d23b005acd3656700a4f58f157e494f28aa3f69c372dded91e0a21c3d SHA512 15c89090701ae92e45a860d85018c5d72bdc7103a15c8632f9ff2fa83273e7ed86bebb4484e39efbfeb9d49aee74734755fb14c414aa7c36a0de015f3ed687cd +EBUILD apertium-3.2.0.ebuild 849 BLAKE2B 74e1005c7d0aef3da2ab440ac3f0b2257e7856516349a0fafaa24d68a2fb64ae7414f2554e661328ae4857d19b2ccd82090d1df5adf7810aa78f33921dff1ab8 SHA512 03159002f7f18a42b06aa67bb414140129ec370327b4401f65191ec01771f15483eabea16b8c5cf8bd332d9edb9acdc3ae85c697bb61926091a25b29e558deed +MISC metadata.xml 331 BLAKE2B ccadf61675d3cfe3507bfe78e6b06bd8bf61abce8e87a426ea1eab81db8c6a33b71531836b7080ab649de37e6313db5c3352fb7f17de54091c6edb4b3f47b487 SHA512 dab2e80addfd126c73c34ac040106dc2e9ec170b454fba992b2d59824fed922e48b3c0bb75a6af7efadd804be4b689aaeacf5cb4c9f567102d7dcfa2b0f3611a diff --git a/sci-misc/apertium/apertium-3.2.0.ebuild b/sci-misc/apertium/apertium-3.2.0.ebuild index 9f77d6c90257..9efd69255cda 100644 --- a/sci-misc/apertium/apertium-3.2.0.ebuild +++ b/sci-misc/apertium/apertium-3.2.0.ebuild @@ -1,34 +1,49 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils +inherit autotools DESCRIPTION="Shallow-transfer machine Translation engine and toolbox" HOMEPAGE="http://apertium.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="static-libs" RDEPEND=" dev-libs/libxslt dev-libs/libpcre[cxx] >=sci-misc/lttoolbox-3.2 virtual/libiconv" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PV}-flags.patch "${FILESDIR}"/${PV}-datadir.patch "${FILESDIR}"/${P}-libpcre.patch - ) + "${FILESDIR}"/${P}-autotools.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf --disable-static +} + +src_compile() { + emake -j1 +} + +src_install() { + default -MAKEOPTS+=" -j1" -AUTOTOOLS_IN_SOURCE_BUILD=1 + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-misc/apertium/files/apertium-3.2.0-autotools.patch b/sci-misc/apertium/files/apertium-3.2.0-autotools.patch new file mode 100644 index 000000000000..4d3a91a795a6 --- /dev/null +++ b/sci-misc/apertium/files/apertium-3.2.0-autotools.patch @@ -0,0 +1,81 @@ +--- a/apertium/Makefile.am ++++ b/apertium/Makefile.am +@@ -78,7 +78,7 @@ + + apertium_pretransfer_SOURCES = apertium_pretransfer.cc + apertium_multiple_translations_SOURCES = apertium-multiple-translations.cc +-apertium_multiple_translations_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_multiple_translations_LDADD = $(APERTIUM_LIBS) libapertium3.la + apertium_destxt_SOURCES = apertium_destxt.cc + apertium_retxt_SOURCES = apertium_retxt.cc + apertium_deshtml_SOURCES = apertium_deshtml.cc +@@ -99,45 +99,45 @@ + apertium_remediawiki_SOURCES = apertium_remediawiki.cc + + apertium_tagger_SOURCES = apertium_tagger.cc +-apertium_tagger_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_tagger_LDADD = $(APERTIUM_LIBS) libapertium3.la + + apertium_tmxbuild_SOURCES = apertium_tmxbuild.cc +-apertium_tmxbuild_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_tmxbuild_LDADD = $(APERTIUM_LIBS) libapertium3.la + + apertium_preprocess_transfer_SOURCES = transferpp.cc + apertium_preprocess_transfer_LDADD = $(APERTIUM_LIBS) \ +- -lapertium$(GENERIC_MAJOR_VERSION) ++ libapertium3.la + + apertium_filter_ambiguity_SOURCES = apertium_filter_ambiguity.cc + apertium_filter_ambiguity_LDADD = $(APERTIUM_LIBS) \ +- -lapertium$(GENERIC_MAJOR_VERSION) ++ libapertium3.la + + apertium_transfer_SOURCES = apertium_transfer.cc +-apertium_transfer_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_transfer_LDADD = $(APERTIUM_LIBS) libapertium3.la + + apertium_interchunk_SOURCES = apertium_interchunk.cc +-apertium_interchunk_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_interchunk_LDADD = $(APERTIUM_LIBS) libapertium3.la + + apertium_postchunk_SOURCES = apertium_postchunk.cc +-apertium_postchunk_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_postchunk_LDADD = $(APERTIUM_LIBS) libapertium3.la + + apertium_lextor_SOURCES = apertium_lextor.cc +-apertium_lextor_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_lextor_LDADD = $(APERTIUM_LIBS) libapertium3.la + + #apertium_lextor_eval_SOURCES = apertium-lextor-eval.C +-#apertium_lextor_eval_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++#apertium_lextor_eval_LDADD = $(APERTIUM_LIBS) libapertium3.la + + apertium_tagger_apply_new_rules_SOURCES = apertium_tagger_apply_new_rules.cc +-apertium_tagger_apply_new_rules_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_tagger_apply_new_rules_LDADD = $(APERTIUM_LIBS) libapertium3.la + + ###apertium_lextor_search_SOURCES = apertium-lextor-search.C +-###apertium_lextor_search_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++###apertium_lextor_search_LDADD = $(APERTIUM_LIBS) libapertium3.la + + ###pruebas_lextor_SOURCES = pruebas-lextor.C +-###pruebas_lextor_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++###pruebas_lextor_LDADD = $(APERTIUM_LIBS) libapertium3.la + + apertium_gen_wlist_lextor_translation_SOURCES = apertium_gen_wlist_lextor_translation.cc +-apertium_gen_wlist_lextor_translation_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION) ++apertium_gen_wlist_lextor_translation_LDADD = $(APERTIUM_LIBS) libapertium3.la + + INCLUDES = -I$(top_srcdir) $(APERTIUM_CFLAGS) + CLEANFILES = *~ apertium_destxt.cc apertium_retxt.cc apertium_deshtml.cc \ +--- a/configure.ac ++++ b/configure.ac +@@ -142,7 +142,7 @@ + + + PKG_CHECK_MODULES(APERTIUM, [dnl +- lttoolbox-3.2 >= required_lttoolbox_version dnl ++ lttoolbox >= required_lttoolbox_version dnl + libxml-2.0 >= required_libxml_version dnl + libpcre >= required_libpcre_version], CPPFLAGS="$CPPFLAGS $APERTIUM_CFLAGS"; LIBS="$LIBS $APERTIUM_LIBS") + diff --git a/sci-misc/apertium/metadata.xml b/sci-misc/apertium/metadata.xml index 8f63e4ee00dd..404668a4bfcf 100644 --- a/sci-misc/apertium/metadata.xml +++ b/sci-misc/apertium/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">apertium</remote-id> - </upstream> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">apertium</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest index f2d63926aaa1..f8eaa09e020b 100644 --- a/sci-misc/h5utils/Manifest +++ b/sci-misc/h5utils/Manifest @@ -1,8 +1,8 @@ AUX h5utils-1.12.1-automagic.patch 2226 BLAKE2B 3c4aac896c971870274410f467943fb4068da96d0cee9a356b98a0c94234d7c101d6cf5951b1f1ca998c692a5efceff183f83fb4e19428331e126f37c60cdb7c SHA512 ae8513c6c214fdd17886b65e77c707c08c97b7c72943ea0608cd8f4d269a4f2ef7df579b5746b76b307a77d68b9993860b6cce8cb6793da21123ad9892769999 AUX h5utils-1.12.1-png15.patch 1420 BLAKE2B 99144644c0ea10ed9be48a40cbe8651eac1620d5b8d42f1cd9c170649e40df38066f585b6f0a59470fe15894a1b0d293ac0f4e98f79510377410c819a2e4b251 SHA512 babc34ab9d585468dabae50d16b7cb59a9326f541c69be5f347189bc6386273a61b9ec3a8a09e00fb2da386ee1fd592f0c85d2c3290134c74d8aa5d1057bd563 -AUX h5utils-1.13.1-automagic.patch 2251 BLAKE2B 7d973a51c595d2221a6824624c6c6cd256e69d3847db43c53f5375b01ab80b3de64c199059a8a478af3b2182902aeef200cb5c43313afbff9946950a83df9d58 SHA512 5d4c2898899f32639033c8b69ae3bedc4ffe1ef5cc19999d1aa383d4b9f20c7b8db35d0f92217f4bb1383841d73e7daac752cf1d71410480754d361ef9bb95e4 +AUX h5utils-1.13.1-automagic.patch 2261 BLAKE2B c9aed879b096c95cf6c17c15d13d6a4a2f0f47afb96e00d382971676cfd34fc53ed802c8070f4d6a19f18165f828746a87efbe845ef89ddeaeee35bcff2eeb87 SHA512 c13621ada5c4f2e2e247bff5d4bd94d19ec888c6fd4b5dde1591ce06a96d346942392c1c3e33bcbd17d30e3d13d4799a7d54a456aa6b52a7123bcad05754d6d9 DIST h5utils-1.12.1.tar.gz 156785 BLAKE2B 55fd5df6ce593261ffb889de1cc575da28d0006e46b5e50c3d5f49caa93b2f9f229e9c8f8444e67b30d7e19a619815dd9d8d46d33c9c25f9fae979a5caaced53 SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547 DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4 EBUILD h5utils-1.12.1-r2.ebuild 782 BLAKE2B 0f758aad9e1c88aeec5a2c2513abe178d19a99686f76c286f5b1e7577de2d5e92f7b6c760e5f579e78bed508b2793801d575a08752de94c65a48a7e589c86ee2 SHA512 45c664a647f17326dc16cf28cfbfe75ad4685122ad9ccfd1ed952d6e4ed2fefd6a234875ebeccea5d063e1210eeaae5f4e3ddbe5430437ec59dff9f3c72ad29c -EBUILD h5utils-1.13.1.ebuild 738 BLAKE2B 9d8de56f8701b6f888dc9b82749bcd878b284e452b47f0a11cf9900f1e372921b83edf9ed7f714f846ccb251f3af369fd3552e75913fa6afe84533db239c4204 SHA512 e3bca11f6e4ac1dcb09647b25198ecb6cd5fe657ba9c673d76c86b093849cd0d33cdb01f7fe60907ac705bf1d8c5734559b71b88a14cd7d7da57ca4455dd7ba0 +EBUILD h5utils-1.13.1.ebuild 737 BLAKE2B 32ba75cd8d4979f1a00d82f12631e9a26dc851db27964353044152814dadf42eaab8995e9027262b4233a44a374093d9dcb9ab88d553a6473e446c98830ba391 SHA512 898174d2a2b5593d0887ddc16cae82aef6c7a51efcac2b61876c84e4f33aa8226d29e66ec1a4df78334cb3e507152fd0c9aacdc7fda201dd1135d1323825bff3 MISC metadata.xml 776 BLAKE2B 4e2af756ae62083753d5204c1524d42b3ebc3a01026a6354b583902c2bd730f1c256bb4c1f63fae9e6ce0ee016bc2d6a0d9aede6117dbbca7ddc47577411653a SHA512 12bda28a2fd9022d8472f81afc827b1329ab84598e8a91a7170bfeffb4b55953b37a9504bffc58933c352ebbdd25beb781e570d5f8de9759a290c4476a40afd1 diff --git a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch index 7c166040cb48..81e7d8a5b605 100644 --- a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch +++ b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch @@ -19,24 +19,7 @@ - H4TOH5="h4toh5" - H5TOH4="h5toh4" -fi -+AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present])) -+ -+AS_IF([test "x$with_hdf" = "xyes"], [ -+ AC_CHECK_HEADERS(hdf.h hdf/hdf.h) -+ AC_CHECK_LIB(jpeg, jpeg_start_compress, -+ [AC_CHECK_LIB(df, DFSDgetdata, -+ [H4_LIBS="-ldf -ljpeg"; HDF4=yes], -+ [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], -+ [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) -+ if test $HDF4 = yes; then -+ MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" -+ MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS" -+ MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" -+ fi -+ -+ AC_SUBST(H4_LIBS) -+]) - +- -HDF4=no -if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then - AC_CHECK_LIB(jpeg, jpeg_start_compress, @@ -57,6 +40,24 @@ - fi -fi -AC_CHECK_HEADERS(hdf.h hdf/hdf.h) ++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present])) ++ ++AS_IF([test "x$with_hdf" = "xyes"], [ ++ AC_CHECK_HEADERS(hdf.h hdf/hdf.h) ++ AC_CHECK_LIB(jpeg, jpeg_start_compress, ++ [AC_CHECK_LIB(df, DFSDgetdata, ++ [H4_LIBS="-ldf -ljpeg"; HDF4=yes], ++ [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], ++ [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) ++ if test $HDF4 = yes; then ++ MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" ++ MORE_H5UTILS_MANS="doc/man/h5fromh4.1 $MORE_H5UTILS_MANS" ++ MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" ++ fi ++ ++ AC_SUBST(H4_LIBS) ++]) ++ -AC_SUBST(H4_LIBS) diff --git a/sci-misc/h5utils/h5utils-1.13.1.ebuild b/sci-misc/h5utils/h5utils-1.13.1.ebuild index 3055754da187..f017eb4ac117 100644 --- a/sci-misc/h5utils/h5utils-1.13.1.ebuild +++ b/sci-misc/h5utils/h5utils-1.13.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/NanoComp/h5utils/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="hdf octave" DEPEND=" |