summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2016-03-12 12:18:29 +0100
committerMarkus Meier <maekke@gentoo.org>2016-03-12 12:18:29 +0100
commit13f429c8a0b8dd1d56e98c84108a20b5b5db9d6f (patch)
tree521d1accc25e828b97a6224efc29acc25535e84a
parentdev-python/alembic: Bump (diff)
downloadgentoo-13f429c8a0b8dd1d56e98c84108a20b5b5db9d6f.tar.gz
gentoo-13f429c8a0b8dd1d56e98c84108a20b5b5db9d6f.tar.bz2
gentoo-13f429c8a0b8dd1d56e98c84108a20b5b5db9d6f.zip
media-libs/gd: remove old for bug #538686
Package-Manager: portage-2.2.27
-rw-r--r--media-libs/gd/Manifest1
-rw-r--r--media-libs/gd/files/gd-2.0.35-fontconfig.patch25
-rw-r--r--media-libs/gd/files/gd-2.0.35-libpng-pkg-config.patch113
-rw-r--r--media-libs/gd/files/gd-2.0.35-libpng14.patch16
-rw-r--r--media-libs/gd/files/gd-2.0.35-maxcolors.patch17
-rw-r--r--media-libs/gd/gd-2.0.35-r3.ebuild69
-rw-r--r--media-libs/gd/gd-2.0.35-r4.ebuild101
-rw-r--r--media-libs/gd/gd-2.1.1.ebuild59
8 files changed, 0 insertions, 401 deletions
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 8fc786d72e2..37031451379 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,2 +1 @@
-DIST gd-2.0.35.tar.bz2 1212730 SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 SHA512 eef8150adc040bed920155337211864a41ae3c4532e852ad443a3a3b9ffdc7fd3130698041b7b19b0b1207e78a80c263c6da26eba7208cdeeff78283c7d0d281 WHIRLPOOL 9eca23a184106652ef5c19ee3b5c18e23d742e21103c66907bf829910b95aa92eea7620c5579bf493c14730bc0327a4d662ffaf9bf9a5538127b8c10cc9c6b84
DIST libgd-2.1.1.tar.xz 2039132 SHA256 9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285 SHA512 48f444402a4b89e412870f9091b92eb26136c5c0d795722262ad973c7d4103476204a2de36133a2634b8f410d6bccdcf60afb829a74ac2fddfb96aff2cd2567b WHIRLPOOL a38cf1f060db35d247b54038e731484e6230cd8a9da263a8c4823aaf6b3ce455c0747bbbde60f131d85a48340e39a5c8d6273fa51366cbe2436530520211a238
diff --git a/media-libs/gd/files/gd-2.0.35-fontconfig.patch b/media-libs/gd/files/gd-2.0.35-fontconfig.patch
deleted file mode 100644
index ca313024870..00000000000
--- a/media-libs/gd/files/gd-2.0.35-fontconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-fix from upstream
-
-http://bugs.gentoo.org/363367
-
-# HG changeset patch
-# User tabe
-# Date 1239812355 0
-# Node ID 3ea283efcdafcb2acc1dd0ace1d3d48da6d8cec8
-# Parent 4f29a877875f63cee5a64e7bea406a61882a565e
-fixed FS#199
-
-199, Fixed useFontConfig() to work as documented (Ethan Merritt)
-
-diff -r 4f29a877875f -r 3ea283efcdaf src/gdft.c
---- a/src/gdft.c Sat Apr 04 12:00:37 2009 +0000
-+++ b/src/gdft.c Wed Apr 15 16:19:15 2009 +0000
-@@ -1688,7 +1688,7 @@
- BGD_DECLARE(int) gdFTUseFontConfig(int flag)
- {
- #ifdef HAVE_LIBFONTCONFIG
-- fontConfigFlag = 1;
-+ fontConfigFlag = flag;
- return 1;
- #else
- return 0;
diff --git a/media-libs/gd/files/gd-2.0.35-libpng-pkg-config.patch b/media-libs/gd/files/gd-2.0.35-libpng-pkg-config.patch
deleted file mode 100644
index 4b8971f1e30..00000000000
--- a/media-libs/gd/files/gd-2.0.35-libpng-pkg-config.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-use libpng's pkg-config files rather than the ugly xxx-config scripts
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,6 +47,7 @@ AC_PROG_LIBTOOL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- #AC_PROG_RANLIB
-+PKG_PROG_PKG_CONFIG
-
- dnl may be required for freetype and Xpm
- AC_PATH_X
-@@ -340,74 +341,26 @@ AC_CHECK_LIB(z,deflate,
- dnl libpng is required
- AC_ARG_WITH(png,dnl
- [ --with-png=DIR where to find the png library],,
-- withval=yes)
--
--# libpng12.so is a nightmare. We have to test separately for
--# libpng12-config and libpng-config. If we find libpng12-config,
--# we don't look for the other, which will just be a symlink to it,
--# confusing autoconf into thinking the library itself will be named -lpng,
--# which it won't be. Awful. This code will suffice unless the libpng
--# authors decide to do this AGAIN. Which I really hope they won't. TBB
--
--if test "$withval" != no; then
-- AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
-- AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
-- if test -n "$LIBPNG12_CONFIG"; then
-- libpng_CPPFLAGS=`libpng12-config --cflags`
-- # should be --ldopts, but it's currently broken
-- libpng_LDFLAGS=`libpng12-config --ldflags`
-- libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
-- elif test -n "$LIBPNG_CONFIG"; then
-- libpng_CPPFLAGS=`libpng-config --cflags`
-- # should be --ldopts, but it's currently broken
-- libpng_LDFLAGS=`libpng-config --ldflags`
-- libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
-- elif test -d "$withval"; then
-- libpng_CPPFLAGS="-I$withval/include"
-- libpng_LDFLAGS="-L$withval/lib"
-- fi
--
-- AC_CHECK_HEADERS(png.h,,
-- [AC_CHECK_HEADERS(libpng/png.h,
-- [CPPFLAGS="$CPPFLAGS $libpng_CPPFLAGS/libpng"],
-- [CPPFLAGS="$_cppflags"])])
--
-- _ldflags="$LDFLAGS"
-- LDFLAGS="$libpng_LDFLAGS $LDFLAGS"
--
-- if test -n "$LIBPNG12_CONFIG"; then
-- AC_CHECK_LIB(png12,png_create_read_struct,
-- [LIBS="-lpng12 $LIBS"
-- FEATURES="GD_PNG $FEATURES"
-- AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
-- [LDFLAGS="$_ldflags"
-- AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])])
-- elif test -n "$LIBPNG_CONFIG"; then
-- AC_CHECK_LIB(png,png_create_read_struct,
-- [LIBS="-lpng $LIBS"
-- FEATURES="GD_PNG $FEATURES"
-- AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
-- [LDFLAGS="$_ldflags"
-- AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])])
-- else
-- AC_CHECK_LIB(png,png_create_read_struct,
-- [LIBS="-lpng $LIBS"
-- FEATURES="GD_PNG $FEATURES"
-- AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
-- [LDFLAGS="$_ldflags"
-- AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])])
-- fi
--else
-- ac_cv_lib_png_png_create_read_struct=no
-+ with_png=detect)
-+
-+if test "$with_png" != no; then
-+ PKG_CHECK_MODULES([LIBPNG], libpng, [
-+ FEATURES="GD_PNG $FEATURES"
-+ AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])
-+ CPPFLAGS="$CPPFLAGS $LIBPNG_CFLAGS"
-+ LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
-+ with_png=yes
-+ ],[
-+ if test "$with_png" = yes; then
-+ AC_MSG_ERROR([png support requested, but not found])
-+ fi
-+ with_png=no
-+ ])
-+fi
-+if test "$with_png" = no; then
- AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])
- fi
-
--#TBB: png12's png_create_read_struct is just as good
--#2.0.23: should be = not ==
--if test "$ac_cv_lib_png12_png_create_read_struct" = yes; then
-- ac_cv_lib_png_png_create_read_struct=yes
--fi
--
- dnl FreeType configure tests snarfed from libwmf ..
- AC_ARG_WITH(freetype,dnl
- [ --with-freetype=DIR where to find the freetype 2.x library],
-@@ -528,7 +481,7 @@ dnl report configuration
- AC_MSG_RESULT([
- ** Configuration summary for $PACKAGE $VERSION:
-
-- Support for PNG library: $ac_cv_lib_png_png_create_read_struct
-+ Support for PNG library: $with_png
- Support for JPEG library: $ac_cv_lib_jpeg_jpeg_set_defaults
- Support for Freetype 2.x library: $ac_cv_lib_freetype_FT_Init_FreeType
- Support for Fontconfig library: $ac_cv_lib_fontconfig_FcInit
diff --git a/media-libs/gd/files/gd-2.0.35-libpng14.patch b/media-libs/gd/files/gd-2.0.35-libpng14.patch
deleted file mode 100644
index 46e621e7755..00000000000
--- a/media-libs/gd/files/gd-2.0.35-libpng14.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/305101
-http://repos.archlinux.org/wsvn/packages/gd/trunk/libpng14.patch
-
-patch in upstream repo already
-
---- gd_png.c
-+++ gd_png.c
-@@ -149,7 +149,7 @@
- return NULL;
- }
-
-- if (!png_check_sig (sig, 8)) { /* bad signature */
-+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
- return NULL; /* bad signature */
- }
-
diff --git a/media-libs/gd/files/gd-2.0.35-maxcolors.patch b/media-libs/gd/files/gd-2.0.35-maxcolors.patch
deleted file mode 100644
index 7d6852ecc09..00000000000
--- a/media-libs/gd/files/gd-2.0.35-maxcolors.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/292130
-
-fix in usptream repo already
-
---- gd-2.0.35/gd_gd.c
-+++ gd-2.0.35/gd_gd.c
-@@ -44,6 +44,10 @@
- {
- goto fail1;
- }
-+ if (im->colorsTotal > gdMaxColors)
-+ {
-+ goto fail1;
-+ }
- }
- /* Int to accommodate truecolor single-color transparency */
- if (!gdGetInt (&im->transparent, in))
diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
deleted file mode 100644
index 6363cfa5c29..00000000000
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A graphics library for fast image creation"
-HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
-
-RDEPEND="fontconfig? ( media-libs/fontconfig )
- jpeg? ( virtual/jpeg:0 )
- png? ( >=media-libs/libpng-1.2:0 )
- truetype? ( >=media-libs/freetype-2.1.5 )
- xpm? ( x11-libs/libXpm x11-libs/libXt )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libpng14.patch #305101
- epatch "${FILESDIR}"/${P}-maxcolors.patch #292130
- epatch "${FILESDIR}"/${P}-fontconfig.patch #363367
- epatch "${FILESDIR}"/${P}-libpng-pkg-config.patch
-
- # Avoid programs we never install
- local make_sed=( -e '/^noinst_PROGRAMS/s:noinst:check:' )
- use png || make_sed+=( -e '/_PROGRAMS/s:(gdparttopng|gdtopng|gd2topng|pngtogd|pngtogd2|webpng)::g' )
- use zlib || make_sed+=( -e '/_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)::g' )
- sed -i -r "${make_sed[@]}" Makefile.am || die
-
- # bug 466996
- sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac || die
-
- cat <<-EOF > acinclude.m4
- m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[:])])
- EOF
-
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_lib_z_deflate=$(usex zlib)
- # we aren't actually {en,dis}abling X here ... the configure
- # script uses it just to add explicit -I/-L paths which we
- # don't care about on Gentoo systems.
- econf \
- --without-x \
- $(use_enable static-libs static) \
- $(use_with fontconfig) \
- $(use_with png) \
- $(use_with truetype freetype) \
- $(use_with jpeg) \
- $(use_with xpm)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc INSTALL README*
- dohtml -r ./
- use static-libs || rm -f "${D}"/usr/*/libgd.la
-}
diff --git a/media-libs/gd/gd-2.0.35-r4.ebuild b/media-libs/gd/gd-2.0.35-r4.ebuild
deleted file mode 100644
index 6fbbc35b637..00000000000
--- a/media-libs/gd/gd-2.0.35-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="A graphics library for fast image creation"
-HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
-
-#fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="prefix? ( fontconfig )"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gdlib-config
-)
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libpng14.patch #305101
- epatch "${FILESDIR}"/${P}-maxcolors.patch #292130
- epatch "${FILESDIR}"/${P}-fontconfig.patch #363367
- epatch "${FILESDIR}"/${P}-libpng-pkg-config.patch
-
- # Avoid programs we never install
- local make_sed=( -e '/^noinst_PROGRAMS/s:noinst:check:' )
- use png || make_sed+=( -e '/_PROGRAMS/s:(gdparttopng|gdtopng|gd2topng|pngtogd|pngtogd2|webpng)::g' )
- use zlib || make_sed+=( -e '/_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)::g' )
- sed -i -r "${make_sed[@]}" Makefile.am || die
-
- # bug 466996
- sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac || die
-
- cat <<-EOF > acinclude.m4
- m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[AC_SUBST(LIBICONV)])])
- EOF
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # setup a default FONT path that has a chance of existing using corefonts,
- # as to make it more useful with e.g. gnuplot
- local fontpath="${EPREFIX}/usr/share/fonts/corefonts"
- # like with fontconfig, try to use fonts from the host OS, because that's
- # beneficial for the user
- use prefix && case ${CHOST} in
- *-darwin*)
- fontpath+=":/Library/Fonts:/System/Library/Fonts"
- ;;
- *-solaris*)
- [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
- fontpath+=":/usr/X/lib/X11/fonts/TrueType"
- [[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
- fontpath+=":/usr/X/lib/X11/fonts/Type1"
- # OpenIndiana
- [[ -d /usr/share/fonts/X11/Type1 ]] && \
- fontpath+=":/usr/share/fonts/X11/Type1"
- ;;
- *-linux-gnu)
- [[ -d /usr/share/fonts/truetype ]] && \
- fontpath+=":/usr/share/fonts/truetype"
- ;;
- esac
- append-cppflags "-DDEFAULT_FONTPATH=\\\"${fontpath}\\\""
-
- export ac_cv_lib_z_deflate=$(usex zlib)
- # we aren't actually {en,dis}abling X here ... the configure
- # script uses it just to add explicit -I/-L paths which we
- # don't care about on Gentoo systems.
- ECONF_SOURCE=${S} \
- econf \
- --without-x \
- $(use_enable static-libs static) \
- $(use_with fontconfig) \
- $(use_with png) \
- $(use_with truetype freetype) \
- $(use_with jpeg) \
- $(use_with xpm)
-}
-
-multilib_src_install_all() {
- dodoc INSTALL README*
- dohtml -r ./
- prune_libtool_files
-}
diff --git a/media-libs/gd/gd-2.1.1.ebuild b/media-libs/gd/gd-2.1.1.ebuild
deleted file mode 100644
index e79bcb067de..00000000000
--- a/media-libs/gd/gd-2.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit libtool multilib-minimal eutils
-
-DESCRIPTION="A graphics library for fast image creation"
-HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="fontconfig jpeg png static-libs truetype webp xpm zlib"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="prefix? ( fontconfig )"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- webp? ( <media-libs/libvpx-1.4.0[${MULTILIB_USEDEP}] )
- xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-headers.patch" #540376
-
- elibtoolize # for shared library on Solaris
-}
-
-multilib_src_configure() {
- # we aren't actually {en,dis}abling X here ... the configure
- # script uses it just to add explicit -I/-L paths which we
- # don't care about on Gentoo systems.
- ECONF_SOURCE=${S} \
- econf \
- --without-x \
- $(use_enable static-libs static) \
- $(use_with fontconfig) \
- $(use_with png) \
- $(use_with truetype freetype) \
- $(use_with jpeg) \
- $(use_with webp vpx) \
- $(use_with xpm) \
- $(use_with zlib)
-}
-
-multilib_src_install_all() {
- dodoc NEWS README
- prune_libtool_files
-}