mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-text/sword: remove old
Signed-off-by: Marek Szuba <marecki@gentoo.org>
This commit is contained in:
Marek Szuba
@@ -1,2 +1 @@
|
||||
DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
|
||||
DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16893,7 +16895,7 @@
|
||||
# ---------------------------------------------------------------------
|
||||
|
||||
# NOTE the $libdir hack at the end of the c[xx]flags. Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
|
||||
+if test "x$with_clucene" != "xno"; then
|
||||
-with_clucene=no
|
||||
if test "x$CLUCENE2_LIBS" != x; then
|
||||
echo "clucene 2.x found - lucene searching options available"
|
||||
AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
|
||||
@@ -16914,6 +16912,11 @@
|
||||
echo "lucene searching options not available"
|
||||
fi
|
||||
fi
|
||||
+else
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
|
||||
+$as_echo "clucene manually disabled - excluding support" >&6; }
|
||||
+with_clucene="no"
|
||||
+fi
|
||||
|
||||
for ac_func in vsnprintf
|
||||
do :
|
||||
@@ -1,138 +0,0 @@
|
||||
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)
|
||||
@@ -1,76 +0,0 @@
|
||||
# Copyright 1999-2020 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="https://www.crosswire.org/sword/"
|
||||
SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc x86 ~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}/"
|
||||
}
|
||||
Reference in New Issue
Block a user