[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     5a00fe4ded1f99ae974e75267a0fd9f61b869e02
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 20:02:52 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 20:07:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a00fe4d

media-libs/giflib: Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/giflib/Manifest                         |   1 -
 .../files/giflib-5.1.4-reallocarray-export.patch   | 128 ---------------------
 media-libs/giflib/giflib-5.1.4-r2.ebuild           |  69 -----------
 media-libs/giflib/giflib-5.1.6-r1.ebuild           |  78 -------------
 4 files changed, 276 deletions(-)

diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 88fedc73955..3b00a85137b 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,6 +1,5 @@
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-DIST giflib-5.1.6.tar.gz 391894 BLAKE2B e961236459d7312b41668f19cfb26006af0f0dc1a9741abee3f00d8eeba0dceebe5b03709dfc8170c1b73a6687dd926c5ef92ac2817fe78ab65160e8012d9044 SHA512 a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be
 DIST giflib-5.1.7.tar.gz 391525 BLAKE2B d994941f4da324f62a16af973b443660b6cf3ee764e9b7f8c165656037f11d482ccd141e9ac8a81ae1096faa4e264602191ebd039cbf5dd2f55e435aef0ab546 SHA512 b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0
 DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2 SHA512 d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3

diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
deleted file mode 100644
index 1c2a433c29c..00000000000
--- a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From dfba2b34d35ddfd47233293f2f28978e8acfc87c Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 14 Mar 2018 21:18:14 +0100
-Subject: [PATCH] Address clash of export reallocarray with glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-.. by renaming the exported symbol and the related
-function in code and where it's used.
-
-Bug: https://bugs.gentoo.org/637438
-
-Compile error was:
-
-/usr/include/gif_lib.h:248:51: error: declaration of ‘void* reallocarray(void*, size_t, size_t)’ has a different exception specifier
- reallocarray(void *optr, size_t nmemb, size_t size);
-                                                   ^
-[..]
-/usr/include/stdlib.h:443:14: error: from previous declaration ‘void* reallocarray(void*, size_t, size_t) throw ()’
- extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)
----
- lib/dgif_lib.c             |  4 ++--
- lib/gif_lib.h              |  2 +-
- lib/gifalloc.c             | 10 +++++-----
- lib/openbsd-reallocarray.c |  2 +-
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
-index 66a1d6a..f0e0385 100644
---- a/lib/dgif_lib.c
-+++ b/lib/dgif_lib.c
-@@ -396,7 +396,7 @@ DGifGetImageDesc(GifFileType *GifFile)
- 
-     if (GifFile->SavedImages) {
-         SavedImage* new_saved_images =
--            (SavedImage *)reallocarray(GifFile->SavedImages,
-+            (SavedImage *)openbsd_reallocarray(GifFile->SavedImages,
-                             (GifFile->ImageCount + 1), sizeof(SavedImage));
-         if (new_saved_images == NULL) {
-             GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
-@@ -1108,7 +1108,7 @@ DGifSlurp(GifFileType *GifFile)
-               if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
-                   return GIF_ERROR;
-               }
--              sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize,
-+              sp->RasterBits = (unsigned char *)openbsd_reallocarray(NULL, ImageSize,
-                       sizeof(GifPixelType));
- 
-               if (sp->RasterBits == NULL) {
-diff --git a/lib/gif_lib.h b/lib/gif_lib.h
-index 078930c..cefc3bb 100644
---- a/lib/gif_lib.h
-+++ b/lib/gif_lib.h
-@@ -245,7 +245,7 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
- extern int GifBitSize(int n);
- 
- extern void *
--reallocarray(void *optr, size_t nmemb, size_t size);
-+openbsd_reallocarray(void *optr, size_t nmemb, size_t size);
- 
- /******************************************************************************
-  Support for the in-core structures allocation (slurp mode).              
-diff --git a/lib/gifalloc.c b/lib/gifalloc.c
-index 3b51868..1394cfa 100644
---- a/lib/gifalloc.c
-+++ b/lib/gifalloc.c
-@@ -188,7 +188,7 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
- 
-         /* perhaps we can shrink the map? */
-         if (RoundUpTo < ColorUnion->ColorCount) {
--            GifColorType *new_map = (GifColorType *)reallocarray(Map,
-+            GifColorType *new_map = (GifColorType *)openbsd_reallocarray(Map,
-                                  RoundUpTo, sizeof(GifColorType));
-             if( new_map == NULL ) {
-                 GifFreeMapObject(ColorUnion);
-@@ -232,7 +232,7 @@ GifAddExtensionBlock(int *ExtensionBlockCount,
-     if (*ExtensionBlocks == NULL)
-         *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock));
-     else {
--        ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray
-+        ExtensionBlock* ep_new = (ExtensionBlock *)openbsd_reallocarray
- 				 (*ExtensionBlocks, (*ExtensionBlockCount + 1),
-                                       sizeof(ExtensionBlock));
-         if( ep_new == NULL )
-@@ -325,7 +325,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
-     if (GifFile->SavedImages == NULL)
-         GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage));
-     else
--        GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages,
-+        GifFile->SavedImages = (SavedImage *)openbsd_reallocarray(GifFile->SavedImages,
-                                (GifFile->ImageCount + 1), sizeof(SavedImage));
- 
-     if (GifFile->SavedImages == NULL)
-@@ -355,7 +355,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
-             }
- 
-             /* next, the raster */
--            sp->RasterBits = (unsigned char *)reallocarray(NULL,
-+            sp->RasterBits = (unsigned char *)openbsd_reallocarray(NULL,
-                                                   (CopyFrom->ImageDesc.Height *
-                                                   CopyFrom->ImageDesc.Width),
- 						  sizeof(GifPixelType));
-@@ -369,7 +369,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
- 
-             /* finally, the extension blocks */
-             if (sp->ExtensionBlocks != NULL) {
--                sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL,
-+                sp->ExtensionBlocks = (ExtensionBlock *)openbsd_reallocarray(NULL,
-                                       CopyFrom->ExtensionBlockCount,
- 				      sizeof(ExtensionBlock));
-                 if (sp->ExtensionBlocks == NULL) {
-diff --git a/lib/openbsd-reallocarray.c b/lib/openbsd-reallocarray.c
-index aa70686..b922b01 100644
---- a/lib/openbsd-reallocarray.c
-+++ b/lib/openbsd-reallocarray.c
-@@ -27,7 +27,7 @@
- #define MUL_NO_OVERFLOW	((size_t)1 << (sizeof(size_t) * 4))
- 
- void *
--reallocarray(void *optr, size_t nmemb, size_t size)
-+openbsd_reallocarray(void *optr, size_t nmemb, size_t size)
- {
- 	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
- 	    nmemb > 0 && SIZE_MAX / nmemb < size) {
--- 
-2.17.0.rc2
-

diff --git a/media-libs/giflib/giflib-5.1.4-r2.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild
deleted file mode 100644
index 940bfb803e3..00000000000
--- a/media-libs/giflib/giflib-5.1.4-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-text/xmlto )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-reallocarray-export.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		# No need for xmlto as they ship generated files.
-		ac_cv_prog_have_xmlto=no
-
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if use doc && multilib_is_native_abi; then
-		emake -C doc
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	# for static libs the .la file is required if built with +X
-	use static-libs || prune_libtool_files --all
-
-	if use doc && multilib_is_native_abi; then
-		docinto html
-		dodoc doc/*.html
-	fi
-}
-
-multilib_src_install_all() {
-	doman doc/*.1
-	docinto
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	if use doc; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/whatsinagif
-	fi
-}

diff --git a/media-libs/giflib/giflib-5.1.6-r1.ebuild b/media-libs/giflib/giflib-5.1.6-r1.ebuild
deleted file mode 100644
index 9f1609ae182..00000000000
--- a/media-libs/giflib/giflib-5.1.6-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-text/xmlto )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.6-gentoo.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Use reallocarray() from libc if available.
-	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then
-		local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY"
-		sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
-		rm openbsd-reallocarray.c || die
-	fi
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
-		LDFLAGS="${LDFLAGS}" \
-		OFLAGS="" \
-		all
-
-	if use doc && multilib_is_native_abi; then
-		emake -C doc
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		MANDIR="${EPREFIX}/usr/share/man/man1" \
-		install
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-
-	if use doc && multilib_is_native_abi; then
-		docinto html
-		dodoc doc/*.html
-	fi
-}
-
-multilib_src_install_all() {
-	docinto
-	dodoc ChangeLog NEWS README TODO
-	if use doc ; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/whatsinagif
-	fi
-}
-
-multilib_src_test() {
-	emake -j1 check
-}