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

[Mike Frysinger]

commit:     f7630e543d6da07c4d465aa935c998dd36aff5af
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 02:52:03 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 04:11:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7630e54

media-libs/imlib2: drop old <1.4.7 versions

 media-libs/imlib2/Manifest                         |  1 -
 .../imlib2/files/imlib2-1.4.5-giflib-5.patch       | 31 --------
 .../imlib2/files/imlib2-1.4.5-no-my-libs.patch     | 28 --------
 media-libs/imlib2/files/imlib2-1.4.6-no-x.patch    | 33 ---------
 .../files/imlib2-1.4.6-out-of-source-build.patch   | 28 --------
 media-libs/imlib2/imlib2-1.4.6-r2.ebuild           | 82 ----------------------
 6 files changed, 203 deletions(-)

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index e33eadb..a7c26bd 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,2 +1 @@
-DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c
 DIST imlib2-1.4.7.tar.gz 1027716 SHA256 48e98337a560d8904f685447f41c43914fec1f8cd3745a9fd86cba9fd24a6563 SHA512 24728586bf0d2a289fdaa7d05385a059b10092f3f777691881f01d6c9e4aa8f893ebb7bc04933644a9f62163cc649272851f1189f72aee83035816caca3a73a2 WHIRLPOOL 662c671b723f4df8267d84607b74bc76b6790d2a694a2e7b3bef084403ae8f41761813455a404c4886dbf3b7b7782534c17677b1ac81bdccf24120a3d07714e1

diff --git a/media-libs/imlib2/files/imlib2-1.4.5-giflib-5.patch b/media-libs/imlib2/files/imlib2-1.4.5-giflib-5.patch
deleted file mode 100644
index 5ca0524..0000000
--- a/media-libs/imlib2/files/imlib2-1.4.5-giflib-5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/457634
-
-From 1df8defbaa5712fe23d34f13d6aae7a568c720a1 Mon Sep 17 00:00:00 2001
-From: Kim Woelders <kim@××××××××.dk>
-Date: Sun, 4 Aug 2013 08:05:27 +0200
-Subject: [PATCH] GIF loader: Fix for libgif version 5.
-
----
- src/modules/loaders/loader_gif.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
-index 23b8fd0..d1c2ae2 100644
---- a/src/modules/loaders/loader_gif.c
-+++ b/src/modules/loaders/loader_gif.c
-@@ -36,7 +37,12 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
- #endif
-    if (fd < 0)
-       return 0;
-+
-+#if GIFLIB_MAJOR >= 5
-+   gif = DGifOpenFileHandle(fd, NULL);
-+#else
-    gif = DGifOpenFileHandle(fd);
-+#endif
-    if (!gif)
-      {
-         close(fd);
--- 
-1.8.4.3
-

diff --git a/media-libs/imlib2/files/imlib2-1.4.5-no-my-libs.patch b/media-libs/imlib2/files/imlib2-1.4.5-no-my-libs.patch
deleted file mode 100644
index 55afb38..0000000
--- a/media-libs/imlib2/files/imlib2-1.4.5-no-my-libs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5dde234b2d3caf067ea827858c53adc5d4c56c13 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Sat, 18 Jan 2014 13:56:54 -0500
-Subject: [PATCH] imlib2-config: delete old reference to @my_libs@
-
-This was cleaned up a while ago, but this file was missed.
-
-URL: https://bugs.gentoo.org/497894
----
- imlib2-config.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/imlib2-config.in b/imlib2-config.in
-index cf814c6..965f7c3 100644
---- a/imlib2-config.in
-+++ b/imlib2-config.in
-@@ -46,7 +46,7 @@ while test $# -gt 0; do
-       ;;
-     --libs)
-       libdirs=-L@libdir@
--      echo $libdirs -lImlib2 @my_libs@
-+      echo $libdirs -lImlib2
-       ;;
-     *)
-       echo "${usage}" 1>&2
--- 
-1.8.4.3
-

diff --git a/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch b/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch
deleted file mode 100644
index b3ce989..0000000
--- a/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/517670
-
-already in upstream
-
-From 3e6ca0b48d2b07980c310935ad1a8dde209efed5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@g.o>
-Date: Mon, 28 Jul 2014 23:01:23 -0400
-Subject: [PATCH] do not link with X libs when X is disabled
-
-Signed-off-by: Mike Frysinger <vapier@g.o>
----
- src/lib/Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index b03f753..93c708f 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -84,7 +84,10 @@ AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
- 
- EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
- 
--MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
-+MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
-+if BUILD_X11
-+MY_LIBS += -lXext -lX11
-+endif
- 
- if BUILD_MMX
- libImlib2_la_LIBADD       = $(MMX_OBJS) $(MY_LIBS)
--- 
-2.0.0
-

diff --git a/media-libs/imlib2/files/imlib2-1.4.6-out-of-source-build.patch b/media-libs/imlib2/files/imlib2-1.4.6-out-of-source-build.patch
deleted file mode 100644
index 8442628..0000000
--- a/media-libs/imlib2/files/imlib2-1.4.6-out-of-source-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d5ebc7399ee03d742a1abe115905c807f8186e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
-Date: Sat, 17 May 2014 09:23:02 +0200
-Subject: [PATCH] Fix -I flags to support building out-of-source.
-
-When building out-of-source, the headers are located in subdirectories
-in $(top_srcdir) rather than $(top_builddir). Adjust AM_CPPFLAGS
-accordingly.
----
- src/bin/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
-index 1d3d445..111c24a 100644
---- a/src/bin/Makefile.am
-+++ b/src/bin/Makefile.am
-@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
- 
- AM_CPPFLAGS = \
- -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
---I$(top_builddir)/src/lib \
-+-I$(top_srcdir)/src/lib \
- $(X_CFLAGS)
- 
- if BUILD_X11
--- 
-1.9.3
-

diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
deleted file mode 100644
index a0f535f..0000000
--- a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
-	EKEY_STATE="snap"
-fi
-
-# Select automake version explicitly to avoid regenerating all autotools.
-# This is a minor optimization.
-WANT_AUTOMAKE="1.13"
-inherit autotools enlightenment toolchain-funcs multilib-minimal
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
-
-RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	gif? ( >=media-libs/giflib-4.1.6-r3[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	)
-	mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	png? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894
-	epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634
-	epatch "${FILESDIR}"/${P}-out-of-source-build.patch #510522
-	epatch "${FILESDIR}"/${P}-no-x.patch
-
-	eautomake
-}
-
-multilib_src_configure() {
-	# imlib2 has diff configure options for x86/amd64 mmx
-	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
-	else
-		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
-	ECONF_SOURCE="${S}" \
-	E_ECONF+=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with gif)
-		$(use_with zlib)
-		$(use_with bzip2)
-		$(use_with mp3 id3)
-	)
-
-	enlightenment_src_configure
-}
-
-multilib_src_install() {
-	enlightenment_src_install
-}