commit: 457fd74562d5265a86c3698f6f113c7352dc5446 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Fri Feb 24 10:35:44 2017 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Fri Feb 24 10:36:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457fd745
media-libs/leptonica: Drop all pre-1.74.1 versions Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-libs/leptonica/Manifest | 2 - .../files/leptonica-1.71-fix-openjpeg-test.patch | 15 ----- .../files/leptonica-1.71-openjpeg-2.0.patch | 26 -------- media-libs/leptonica/leptonica-1.71-r1.ebuild | 72 ---------------------- media-libs/leptonica/leptonica-1.71.ebuild | 62 ------------------- media-libs/leptonica/leptonica-1.74.ebuild | 62 ------------------- 6 files changed, 239 deletions(-) diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest index 24eb3d767c..d41cb3be00 100644 --- a/media-libs/leptonica/Manifest +++ b/media-libs/leptonica/Manifest @@ -1,3 +1 @@ -DIST leptonica-1.71.tar.gz 10212309 SHA256 cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848 SHA512 fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51 WHIRLPOOL 5a3d57735e8e36785dea9a481a602b0f812c08bab5e42ebaac2e3fa2d42a0c8c697a61351ec1122a14fd9f471945c200a1c75015bd35b043fd208a1cad079733 DIST leptonica-1.74.1.tar.gz 11707064 SHA256 746a517a47a3bd2a90bc8d581ca6464c10f30e91a60209735efe45b3778bec62 SHA512 c6f08458d288997283aa56258932a79f4ecef10bf3fb95c91749b8b6fbe2a1573774371d969a43c2b73eb6fd67c1d6a3d07db465c29e5055bd42fc0ac22a5b47 WHIRLPOOL 6ff724464e4a2522c3a5f10854562e9f20800fd43ee4c4957cf5afdf979e5b90b1fdf6ed75ca0a14f1d5eedc1795d37e491020ca476c3917c718c381e0339752 -DIST leptonica-1.74.tar.gz 11624575 SHA256 e170f8a3f79e7f1742aff975ad5bb0c4a124df1532e6e38d9d71aaa5111de5a2 SHA512 6c563a8f30faf7dc0ad321aa58a012a0d03fc3fba7eb3c3e7b69be8bf2e71cc5f13420ded9cc08b232a780b78234e10bbdbe6a77ef26c5af330c6c6eac477f77 WHIRLPOOL 1ae8f107a7c7b5068307aea5687ee3d38169c8c18da0dd8aa1d7c1fe613adab6bc8ccb58bb54bd8ab09576594444d4fdaa03fc35f3d90c25f3431aa9bbbef0fc diff --git a/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch b/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch deleted file mode 100644 index f7d18a24ad..0000000000 --- a/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- leptonica-1.71.orig/configure.ac 2014-08-31 14:33:16.834598973 +0200 -+++ leptonica-1.71/configure.ac 2014-09-01 10:56:59.394975447 +0200 -@@ -78,10 +78,10 @@ - ) - ) - --AS_IF([test "x$with_libopenjp2" != xno], -+AS_IF([test "x$with_libopenjpeg" != xno], - AC_CHECK_LIB([openjp2], [opj_create_decompress], - AC_DEFINE([HAVE_LIBJP2K], 1, [Define to 1 if you have libopenjp2.]) AC_SUBST([LIBJP2K_LIBS], [-lopenjp2]), -- AS_IF([test "x$with_libopenjp2" = xyes], AC_MSG_ERROR([libopenjp2 support requested but library not found])) -+ AS_IF([test "x$with_libopenjpeg" = xyes], AC_MSG_ERROR([libopenjp2 support requested but library not found])) - ) - ) - diff --git a/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch b/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch deleted file mode 100644 index ed855729f1..0000000000 --- a/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -Better use `pkg-config --cflags libopenjp2` - -Michael Weber, x...@gentoo.org - ---- leptonica-1.71/src/libversions.c -+++ leptonica-1.71/src/libversions.c -@@ -69,7 +69,7 @@ - #endif - - #if HAVE_LIBJP2K /* assuming it's 2.1 */ --#include "openjpeg-2.1/openjpeg.h" -+#include "openjpeg-2.0/openjpeg.h" - #endif - - #define stringJoinInPlace(s1, s2) \ ---- leptonica-1.71/src/jp2kio.c -+++ leptonica-1.71/src/jp2kio.c -@@ -108,7 +108,7 @@ - - /* Leptonica supports both 2.0 and 2.1. If you have 2.0, - * change MINOR to 0. */ --#define MINOR 1 -+#define MINOR 0 - - #if MINOR == 0 - static const l_int32 OpjMinor = 0; diff --git a/media-libs/leptonica/leptonica-1.71-r1.ebuild b/media-libs/leptonica/leptonica-1.71-r1.ebuild deleted file mode 100644 index 1baff3d9cc..0000000000 --- a/media-libs/leptonica/leptonica-1.71-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF="1" -inherit eutils autotools-utils - -DESCRIPTION="C library for image processing and analysis" -HOMEPAGE="http://www.leptonica.org/"; -SRC_URI="http://www.leptonica.com/source/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 sparc x86" -IUSE="gif jpeg jpeg2k png tiff webp utils zlib static-libs test" - -# N.b. Tests need all tested features enabled: -REQUIRED_USE="test? ( gif jpeg jpeg2k png tiff webp )" - -DEPEND="gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/openjpeg:2= ) - png? ( media-libs/libpng - sys-libs/zlib - ) - tiff? ( media-libs/tiff ) - webp? ( media-libs/libwebp ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -DOCS=( README version-notes ) -PATCHES=( "${FILESDIR}"/"${P}"-fix-openjpeg-test.patch ) - -src_prepare() { - if has_version "=media-libs/openjpeg-2.0.0" ; then - epatch "${FILESDIR}"/"${P}"-openjpeg-2.0.patch - fi - - # unhtmlize docs - local X - for X in ${DOCS[@]}; do - awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \ - "${X}.html" > "${X}" || die 'awk failed' - rm -f -- "${X}.html" - done - autotools-utils_src_prepare -} - -src_configure() { - # $(use_with webp libwebp) -> unknown - # so use-flag just for pulling dependencies - # zlib handling see bug 454890 - local myeconfargs=( - $(use_with gif giflib) - $(use_with jpeg) - $(use_with jpeg2k libopenjpeg) - $(use_with png libpng) - $(use_with tiff libtiff) - $(use_enable utils programs) - $(use_enable static-libs static) - ) - # libpng requires zlib: - if use png && ! use zlib ; then - # Ignore users non-sensical choice of -zlib - myeconfargs+=("--with-zlib") - else - myeconfargs+=( $(use_with zlib) ) - fi - autotools-utils_src_configure -} diff --git a/media-libs/leptonica/leptonica-1.71.ebuild b/media-libs/leptonica/leptonica-1.71.ebuild deleted file mode 100644 index 72d5fd9c79..0000000000 --- a/media-libs/leptonica/leptonica-1.71.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils autotools-utils - -DESCRIPTION="C library for image processing and analysis" -HOMEPAGE="http://www.leptonica.org/"; -SRC_URI="http://www.leptonica.com/source/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 ~sparc x86" -IUSE="gif jpeg jpeg2k png tiff webp utils zlib static-libs" - -DEPEND="gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( >=media-libs/openjpeg-2.1 ) - !jpeg2k? ( !<media-libs/openjpeg-2.1 ) - png? ( media-libs/libpng ) - tiff? ( media-libs/tiff ) - webp? ( media-libs/libwebp ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -DOCS=( README version-notes ) - -src_prepare() { - # unhtmlize docs - local X - for X in ${DOCS[@]}; do - awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \ - "${X}.html" > "${X}" || die 'awk failed' - rm -f -- "${X}.html" - done - autotools-utils_src_prepare -} - -src_configure() { - # $(use_with webp libwebp) -> unknown - # so use-flag just for pulling dependencies - # zlib handling see bug 454890 - local myeconfargs=( - $(use_with gif giflib) - $(use_with jpeg) - $(use_with jpeg2k libopenjpeg) - $(use_with png libpng) - $(use_with tiff libtiff) - $(use_enable utils programs) - $(use_enable static-libs static) - ) - # libpng requires zlib: - if use png && ! use zlib ; then - # Ignore users non-sensical choice of -zlib - myeconfargs+=("--with-zlib") - else - myeconfargs+=( $(use_with zlib) ) - fi - autotools-utils_src_configure -} diff --git a/media-libs/leptonica/leptonica-1.74.ebuild b/media-libs/leptonica/leptonica-1.74.ebuild deleted file mode 100644 index 260e2d91a3..0000000000 --- a/media-libs/leptonica/leptonica-1.74.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit eutils multilib-minimal - -DESCRIPTION="C library for image processing and analysis" -HOMEPAGE="http://www.leptonica.org/"; -SRC_URI="http://www.leptonica.org/source/${P}.tar.gz"; -LICENSE="Apache-2.0" -SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib" - -# N.B. Tests need some features enabled: -REQUIRED_USE="test? ( jpeg png tiff zlib )" - -DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" - -ECONF_SOURCE="${S}" -DOCS=( README version-notes ) - -src_prepare() { - default - - # unhtmlize docs - local X - for X in ${DOCS[@]}; do - awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \ - "${X}.html" > "${X}" || die 'awk failed' - rm -f -- "${X}.html" - done -} - -multilib_src_configure() { - econf \ - --enable-shared \ - $(use_with gif giflib) \ - $(use_with jpeg) \ - $(use_with jpeg2k libopenjpeg) \ - $(use_with png libpng) \ - $(use_with tiff libtiff) \ - $(use_with webp libwebp) \ - $(use_with zlib) \ - $(use_enable static-libs static) \ - $(multilib_native_use_enable utils programs) -} - -src_install() { - multilib-minimal_src_install - prune_libtool_files -}
