From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- app-text/sword/Manifest | 5 +- app-text/sword/files/sword-1.8.1-icu61.diff | 138 ++++++++++++++++++++++++++++ app-text/sword/sword-1.8.0.ebuild | 84 ----------------- app-text/sword/sword-1.8.1-r1.ebuild | 76 +++++++++++++++ 4 files changed, 217 insertions(+), 86 deletions(-) create mode 100644 app-text/sword/files/sword-1.8.1-icu61.diff delete mode 100644 app-text/sword/sword-1.8.0.ebuild create mode 100644 app-text/sword/sword-1.8.1-r1.ebuild (limited to 'app-text/sword') diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest index 4c4556e39168..7b3378b5f203 100644 --- a/app-text/sword/Manifest +++ b/app-text/sword/Manifest @@ -1,7 +1,8 @@ AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186 AUX sword-1.7.4-gcc6.patch 626 BLAKE2B 69b56ed6152d07962d5941868925ac35825256e4db22cc435c7580694925694902eb6c322d143af7148ea4a60828e059409625e9415cbb5f8905d98b4a1d85c5 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04 +AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d414424fc3ca7618a098d6e3ee82c440eb95c3370eeb0dbe46a4abe7ccc0c62e7b725cfed0f8ec0951e11099627337 SHA512 7bd545014ea81fa5f6203d39fd1a4125ae163ac51fe76270511b1df65d4dbf44b912fbaf3fa6a6d6a20370efc3abfff9feabe5de7177981ce1b62f4d9c5ce49d DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75 -DIST sword-1.8.0.tar.gz 2444386 BLAKE2B dd74ca409cdc3e4563ec5f0ed225556cfc3d1c89e63b41df8335b4abdd4f36b1423a2953a86105d2efe8d57c0e57065f74e74629309bab93f2a0222b9a8fcc86 SHA512 c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e +DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36 EBUILD sword-1.7.4-r1.ebuild 1974 BLAKE2B cdccfbf2bc8cc2f6a22b1bf88a929faf3a6305f271956acf83f0e9d4383b02a6e74201bc0accb28becc05b5e979f4032dcd48d9addab74ca5563c0bcb4d008c4 SHA512 b9c272643badb68f6af83bdf7a50f070f3a0fa56ed21ecf9c1b1ae941e5bee671cc9674fc8fba3b6042bc111f19576fa3d731700b7a9c91fbc637558e74886f0 -EBUILD sword-1.8.0.ebuild 1924 BLAKE2B aeb08e11551a7a8e81acf4da0aa69530772a49334c75a14f74b63109c73d89115d4abc0e1c815a892182edbc907a3689e8387c2c045f3230763c71f7c39bfaa8 SHA512 7c880515213d6fb58091177351f799ea49d8633e7f3bd8da5e396555c456dc4796d3b8798b21c56ae8d44b4ebd5543bf2116786cce2065a651572431dbc54475 +EBUILD sword-1.8.1-r1.ebuild 1826 BLAKE2B 7f9e2ae2a44ff3ec5704ede93ec93d08c47e4f78514d31d82326f910fd3f99fe2fc6a66283e405609ac9bff4c1f92849a1aa251cc2e74b2f3eebe3b29e04b686 SHA512 68b8d8194239b84cbfae825c91dda775ce0808eb07a0bf1b1affc046c736454153cb25c740f7310265d362eab8d15d701af38c6150fc394ea78dc18689852b0f MISC metadata.xml 564 BLAKE2B b7ed0b7e3e245079c82d4ebcb446a1e864e0f72610ac9c60d98fbfc73c7d078f12ddb7d1650fbc3816ac292c8c6b122990a71b0e99056eb21bdb4f3a8dc8b3ec SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff b/app-text/sword/files/sword-1.8.1-icu61.diff new file mode 100644 index 000000000000..2129f279ddc6 --- /dev/null +++ b/app-text/sword/files/sword-1.8.1-icu61.diff @@ -0,0 +1,138 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5cbd06a..1d3a2d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,4 @@ +-# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system +-# limit pkg-config version to >= 0.14, demo, utilities, doc, tests ++# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests + # use BUILD_SHARED_LIBS + # convince perl swig bindings to build properly + # +@@ -13,7 +12,7 @@ + # all posterity and eternity, wherever such transfer is possible. Where it is + # not, then this file is released under the GPLv2 by myself. + PROJECT(libsword CXX C) +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0) + SET(SWORD_VERSION 1.8.1) + + # Make sure it's an out-of-stream build +@@ -56,7 +55,8 @@ IF(MSVC) + ELSE(MSVC) + FIND_PACKAGE(BZIP2 QUIET) + FIND_PACKAGE(XZ QUIET) +- FIND_PACKAGE(ICU QUIET) ++ FIND_PACKAGE(ICU ++ COMPONENTS data i18n io uc) + FIND_PACKAGE(CURL QUIET) + ENDIF(MSVC) + FIND_PACKAGE(CLucene QUIET) +@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE) + IF(WITH_ICU) + INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS}) + ADD_DEFINITIONS(${ICU_DEFINITIONS}) +- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) ++ MESSAGE(STATUS "ICU Version: ${ICU_VERSION}") ++ IF("${ICU_VERSION}" VERSION_GREATER "61") ++ ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE) ++ ENDIF("${ICU_VERSION}" VERSION_GREATER "61") ++ SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES}) + ENDIF(WITH_ICU) + IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) + SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY}) +diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake +deleted file mode 100644 +index 451c2f3..0000000 +--- a/cmake/FindICU.cmake ++++ /dev/null +@@ -1,68 +0,0 @@ +-# Finds the International Components for Unicode (ICU) Library +-# +-# ICU_FOUND - True if ICU found. +-# ICU_I18N_FOUND - True if ICU's internationalization library found. +-# ICU_INCLUDE_DIRS - Directory to include to get ICU headers +-# Note: always include ICU headers as, e.g., +-# unicode/utypes.h +-# ICU_LIBRARIES - Libraries to link against for the common ICU +-# ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation +-# (note: in addition to ICU_LIBRARIES) +- +-# Look for the header file. +-find_path( +- ICU_INCLUDE_DIR +- NAMES unicode/utypes.h +- DOC "Include directory for the ICU library") +-mark_as_advanced(ICU_INCLUDE_DIR) +- +-# Look for the library. +-find_library( +- ICU_LIBRARY +- NAMES icuuc cygicuuc cygicuuc32 +- DOC "Libraries to link against for the common parts of ICU") +-mark_as_advanced(ICU_LIBRARY) +- +-# Copy the results to the output variables. +-if(ICU_INCLUDE_DIR AND ICU_LIBRARY) +- set(ICU_FOUND 1) +- set(ICU_LIBRARIES ${ICU_LIBRARY}) +- set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) +- +- # Look for the ICU internationalization libraries +- find_library( +- ICU_I18N_LIBRARY +- NAMES icuin icui18n cygicuin cygicuin32 +- DOC "Libraries to link against for ICU internationalization") +- if(MSVC) +- find_library(ICU_DATA_LIBRARY +- NAMES icudt +- DOC "Libraries to link against for ICU data") +- set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARY}) +- endif(MSVC) +- mark_as_advanced(ICU_I18N_LIBRARY) +- mark_as_advanced(ICU_DATA_LIBRARY) +- if (ICU_I18N_LIBRARY) +- set(ICU_I18N_FOUND 1) +- set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY}) +- else (ICU_I18N_LIBRARY) +- set(ICU_I18N_FOUND 0) +- set(ICU_I18N_LIBRARIES) +- endif (ICU_I18N_LIBRARY) +-else(ICU_INCLUDE_DIR AND ICU_LIBRARY) +- set(ICU_FOUND 0) +- set(ICU_I18N_FOUND 0) +- set(ICU_LIBRARIES) +- set(ICU_I18N_LIBRARIES) +- set(ICU_INCLUDE_DIRS) +-endif(ICU_INCLUDE_DIR AND ICU_LIBRARY) +- +-IF(ICU_FOUND) +- IF(NOT ICU_FIND_QUIETLY) +- MESSAGE(STATUS "ICU: Yes ${ICU_I18N_LIBRARY}") +- ENDIF(NOT ICU_FIND_QUIETLY) +-ELSE(ICU_FOUND) +- IF(ICU_FIND_REQUIRED) +- MESSAGE(FATAL_ERROR "ICU: No") +- ENDIF(ICU_FIND_REQUIRED) +-ENDIF(ICU_FOUND) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 30818a8..08bc573 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -75,10 +75,12 @@ ENDFOREACH(TEST ${test_PROGRAMS}) + + ######################################################################################## + # The following tests require extra libraries to run +-# +-FOREACH(ICUTEST icutest translittest) +- TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) +-ENDFOREACH(ICUTEST icutest translittest) ++# ++IF(WITH_ICU) ++ FOREACH(ICUTEST icutest translittest) ++ TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) ++ ENDFOREACH(ICUTEST icutest translittest) ++ENDIF(WITH_ICU) + + # Excluded until I know we have the tests working + ADD_SUBDIRECTORY(testsuite) diff --git a/app-text/sword/sword-1.8.0.ebuild b/app-text/sword/sword-1.8.0.ebuild deleted file mode 100644 index bb6ed4a2b108..000000000000 --- a/app-text/sword/sword-1.8.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="Library for Bible reading software" -HOMEPAGE="http://www.crosswire.org/sword/" -SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos" -IUSE="clucene curl debug doc icu static-libs" - -RDEPEND="sys-libs/zlib - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:= ) - clucene? ( dev-cpp/clucene ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -DOCS="AUTHORS CODINGSTYLE ChangeLog README" - -RESTRICT="test" #Restricting for now, see bug 313207 - -src_prepare() { - sed -i \ - -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \ - -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \ - configure || die - - sed -i -e '/FLAGS/s:-Werror::' configure || die #408289 - sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055 - - cat <<-EOF > "${T}"/${PN}.conf - [Install] - DataPath=${EPREFIX}/usr/share/${PN}/ - EOF - eapply "${FILESDIR}/${PN}-1.7.4-configure.patch" - eapply_user -} - -src_configure() { - # TODO: Why is this here and can we remove it? - strip-flags - - # bug 618776 - append-cxxflags -std=c++14 - - econf \ - $(use_enable static-libs static) \ - $(use_enable debug) \ - --with-zlib \ - $(use_with icu) \ - --with-conf \ - $(use_with curl) \ - $(use_with clucene) -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm -f {} + - - if use doc; then - rm -rf examples/.cvsignore - rm -rf examples/cmdline/.cvsignore - rm -rf examples/cmdline/.deps - cp -R samples examples "${ED}"/usr/share/doc/${PF}/ - fi - - insinto /etc - doins "${T}"/${PN}.conf -} - -pkg_postinst() { - elog "Check out http://www.crosswire.org/sword/modules/" - elog "to download modules that you would like to use with SWORD." - elog "Follow module installation instructions found on" - elog "the web or in ${EROOT}/usr/share/doc/${PF}/" -} diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild new file mode 100644 index 000000000000..97ffa1634b52 --- /dev/null +++ b/app-text/sword/sword-1.8.1-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic cmake-utils + +DESCRIPTION="Library for Bible reading software" +HOMEPAGE="http://www.crosswire.org/sword/" +SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos" +IUSE="clucene curl debug doc icu static-libs" + +RDEPEND="sys-libs/zlib + curl? ( net-misc/curl ) + icu? ( dev-libs/icu:= ) + clucene? ( dev-cpp/clucene ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +DOCS="AUTHORS CODINGSTYLE ChangeLog README" + +RESTRICT="test" #Restricting for now, see bug 313207 + +src_prepare() { + sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055 + eapply "${FILESDIR}/${PN}-1.7.4-configure.patch" + eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff" + eapply_user + + cmake-utils_src_prepare +} + +src_configure() { + # bug 618776 + append-cxxflags -std=c++14 + + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DWITH_CLUCENE=$(usex clucene) + -DWITH_CURL=$(usex curl) + -DWITH_ICU=$(usex icu) + -DWITH_ZLIB=1 + ) + use static-libs && mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE=Static ) + + cmake-utils_src_configure +} + +src_install() { + default + + find "${ED}" -name '*.la' -exec rm -f {} + + + if use doc; then + rm -rf examples/.cvsignore + rm -rf examples/cmdline/.cvsignore + rm -rf examples/cmdline/.deps + cp -R samples examples "${ED}"/usr/share/doc/${PF}/ + fi + + insinto /etc + cmake-utils_src_install +} + +pkg_postinst() { + elog "Check out http://www.crosswire.org/sword/modules/" + elog "to download modules that you would like to use with SWORD." + elog "Follow module installation instructions found on" + elog "the web or in ${EROOT}/usr/share/doc/${PF}/" +} -- cgit v1.2.3