[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-10-29 Thread Marek Szuba 
commit: 51db9fe407024951280b2518b4eac537c200f08a
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Oct 29 12:06:30 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Oct 29 12:06:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51db9fe4

media-libs/libafterimage: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 .../libafterimage/libafterimage-1.20-r3.ebuild | 105 -
 1 file changed, 105 deletions(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
deleted file mode 100644
index 026e4af1c4a..000
--- a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=libAfterImage
-
-DESCRIPTION="Afterstep's standalone generic image manipulation library"
-HOMEPAGE="http://www.afterstep.org/afterimage/index.php;
-SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
-
-RDEPEND="
-   X?  ( x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXrender )
-   gif?( media-libs/giflib:0= )
-   jpeg?   ( virtual/jpeg:0 )
-   png?( >=media-libs/libpng-1.4:0= )
-   svg?( gnome-base/librsvg:2 )
-   tiff?   ( media-libs/tiff:0 )
-   truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-   X?  ( x11-base/xorg-proto )
-   virtual/pkgconfig
-   !!x11-wm/afterstep"
-REQUIRED_USE="
-   shaping? ( X )
-   shm? ( X )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-   default
-
-   # fix some ldconfig problem in makefile.in
-   eapply -p0 "${FILESDIR}"/${PN}-makefile.in.patch
-   # fix lib paths in afterimage-config
-   eapply -p0 "${FILESDIR}"/${PN}-config.patch
-   # fix gif unbundle
-   eapply -p0 "${FILESDIR}"/${PN}-gif.patch
-   # fix for libpng15 compability
-   eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
-   # add giflib-5 API support, bug 571654
-   eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
-   # do not build examples
-   use examples || sed -i \
-   -e '/^all:/s/apps//' \
-   -e '/^install:/s/install.apps//' \
-   Makefile.in || die "sed failed"
-   # remove forced flags
-   sed -i \
-   -e 's/CFLAGS="-O3"//' \
-   -e 's/ -rdynamic//' \
-   configure.in || die "sed failed"
-
-   mv configure.in configure.ac || die
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable cpu_flags_x86_mmx mmx-optimization) \
-   $(use_enable nls i18n) \
-   $(use_enable shaping) \
-   $(use_enable shm shmimage ) \
-   $(use_enable static-libs staticlibs) \
-   $(use_with X x) \
-   $(use_with gif) \
-   $(use_with jpeg) \
-   $(use_with png) \
-   $(use_with svg) \
-   $(use_with tiff) \
-   $(use_with truetype ttf) \
-   --disable-glx \
-   --enable-sharedlibs \
-   --with-xpm \
-   --without-builtin-gif \
-   --without-builtin-jpeg \
-   --without-builtin-png \
-   --without-builtin-zlib \
-   --without-afterbase
-}
-
-src_install() {
-   emake \
-   DESTDIR="${D}" \
-   AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
-   install
-   dodoc ChangeLog README
-   if use examples; then
-   cd apps || die
-   mv ascompose.man ascompose.1 || die
-   doman ascompose.1
-   emake clean
-   rm Makefile* ascompose.1 || die
-   insinto /usr/share/doc/${PF}/examples
-   doins *
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-10-13 Thread Agostino Sarubbo 
commit: 8a648f56256857f6caba578d4faee13868f388e3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 13 06:01:12 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 13 06:01:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a648f56

media-libs/libafterimage: sparc stable wrt bug #817887

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index 0e2439b7767..f675d1e82b9 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-10-12 Thread Sam James 
commit: 3eea10bb64e26e5734d0e38350d5857f28d371cc
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 12 18:57:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 12 18:57:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eea10bb

media-libs/libafterimage: Stabilize 1.20-r4 ppc64, #817887

Signed-off-by: Sam James  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index 3a9b9412338..0e2439b7767 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-10-12 Thread Sam James 
commit: 133982e23735b03818e01506644c02646a9c32e5
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 12 18:55:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 12 18:55:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133982e2

media-libs/libafterimage: Stabilize 1.20-r4 x86, #817887

Signed-off-by: Sam James  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index a464cacbc45..3a9b9412338 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-10-12 Thread Marek Szuba 
commit: f313dfda7032bf00616ee6fac16293111daf3a90
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct 12 18:09:24 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct 12 18:09:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f313dfda

media-libs/libafterimage: stabilize 1.20-r4 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index a682ba6f4ee..a464cacbc45 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-05-19 Thread Andrew Savchenko 
commit: d09ef4a5dc46b501ab7e7cdb4162980fb35fa2d9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 23:09:37 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 23:12:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09ef4a5

media-libs/libafterimage: fix minor qa issues

https://qa-reports.gentoo.org/output/gentoo-ci/75fab47/output.html;pkg=media-libs:libafterimage

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r4.ebuild | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index 33cb313ecb7..a682ba6f4ee 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -26,8 +26,7 @@ RDEPEND="
tiff?   ( media-libs/tiff:0 )
truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
-   X?  ( x11-base/xorg-proto )
-   !!x11-wm/afterstep"
+   X?  ( x11-base/xorg-proto )"
 BDEPEND="
virtual/pkgconfig"
 REQUIRED_USE="
@@ -49,7 +48,7 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
# add giflib-5 API support, bug 571654
eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
-   # fix ar: respect $(AR), bug 731044 and drop 'l' flag, bug 784182 
+   # fix ar: respect $(AR), bug 731044 and drop 'l' flag, bug 784182
eapply "${FILESDIR}"/${PN}-ar.patch
# detect freetype properly, bug 783375
eapply "${FILESDIR}"/${PN}-freetype.patch
@@ -104,7 +103,7 @@ src_install() {
doman ascompose.1
emake clean
rm Makefile* ascompose.1 || die
-   insinto /usr/share/doc/${PF}/examples
-   doins *
+   docinto examples
+   dodoc *
fi
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-05-19 Thread Andrew Savchenko 
commit: 75080953d8137f77bdd110e9eedd3318d6d6017b
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 21:32:29 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 21:32:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75080953

media-libs/libafterimage: cleanup old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../libafterimage/libafterimage-1.20-r2.ebuild | 107 -
 1 file changed, 107 deletions(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
deleted file mode 100644
index f66921efd7c..000
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=libAfterImage
-
-DESCRIPTION="Afterstep's standalone generic image manipulation library"
-HOMEPAGE="http://www.afterstep.org/afterimage/index.php;
-SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
-
-RDEPEND="
-   X?  ( x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXrender )
-   gif?( media-libs/giflib:0= )
-   jpeg?   ( virtual/jpeg:0 )
-   opengl? ( virtual/opengl )
-   png?( >=media-libs/libpng-1.4:0= )
-   svg?( gnome-base/librsvg:2 )
-   tiff?   ( media-libs/tiff:0 )
-   truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-   X?  ( x11-base/xorg-proto )
-   virtual/pkgconfig
-   !!x11-wm/afterstep"
-REQUIRED_USE="
-   opengl?  ( X )
-   shaping? ( X )
-   shm? ( X )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-   default
-
-   # fix some ldconfig problem in makefile.in
-   eapply -p0 "${FILESDIR}"/${PN}-makefile.in.patch
-   # fix lib paths in afterimage-config
-   eapply -p0 "${FILESDIR}"/${PN}-config.patch
-   # fix gif unbundle
-   eapply -p0 "${FILESDIR}"/${PN}-gif.patch
-   # fix for libpng15 compability
-   eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
-   # add giflib-5 API support, bug 571654
-   eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
-   # do not build examples
-   use examples || sed -i \
-   -e '/^all:/s/apps//' \
-   -e '/^install:/s/install.apps//' \
-   Makefile.in || die "sed failed"
-   # remove forced flags
-   sed -i \
-   -e 's/CFLAGS="-O3"//' \
-   -e 's/ -rdynamic//' \
-   configure.in || die "sed failed"
-
-   mv configure.in configure.ac || die
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable cpu_flags_x86_mmx mmx-optimization) \
-   $(use_enable opengl glx) \
-   $(use_enable nls i18n) \
-   $(use_enable shaping) \
-   $(use_enable shm shmimage ) \
-   $(use_enable static-libs staticlibs) \
-   $(use_with X x) \
-   $(use_with gif) \
-   $(use_with jpeg) \
-   $(use_with png) \
-   $(use_with svg) \
-   $(use_with tiff) \
-   $(use_with truetype ttf) \
-   --enable-sharedlibs \
-   --with-xpm \
-   --without-builtin-gif \
-   --without-builtin-jpeg \
-   --without-builtin-png \
-   --without-builtin-zlib \
-   --without-afterbase
-}
-
-src_install() {
-   emake \
-   DESTDIR="${D}" \
-   AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
-   install
-   dodoc ChangeLog README
-   if use examples; then
-   cd apps || die
-   mv ascompose.man ascompose.1 || die
-   doman ascompose.1
-   emake clean
-   rm Makefile* ascompose.1 || die
-   insinto /usr/share/doc/${PF}/examples
-   doins *
-   fi
-}

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

2021-05-19 Thread Andrew Savchenko 
commit: b22db36af30264f2cde7c55e627cae4a125c0af9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 21:04:23 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 21:13:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22db36a

media-libs/libafterimage: fix multiple bugs

- Update to EAPI 7
- Use $(AR) if any, fallback to direct ar, bug 731044
- Drop non-standard 'l' from ar args, bug 784182
- Properly detect freetype: use pkg-config, bug 783375

Bug: https://bugs.gentoo.org/784182
Bug: https://bugs.gentoo.org/731044
Bug: https://bugs.gentoo.org/783375
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../libafterimage/files/libafterimage-ar.patch |  39 
 .../files/libafterimage-freetype.patch |  23 +
 .../libafterimage/libafterimage-1.20-r4.ebuild | 110 +
 3 files changed, 172 insertions(+)

diff --git a/media-libs/libafterimage/files/libafterimage-ar.patch 
b/media-libs/libafterimage/files/libafterimage-ar.patch
new file mode 100644
index 000..6e8d0bb8cd4
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-ar.patch
@@ -0,0 +1,39 @@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/Makefile.in 
libAfterImage-1.20/Makefile.in
+--- libAfterImage-1.20.orig/Makefile.in2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/Makefile.in 2021-05-19 23:32:32.793826120 +0300
+@@ -78,7 +78,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/aftershow/Makefile.in 
libAfterImage-1.20/aftershow/Makefile.in
+--- libAfterImage-1.20.orig/aftershow/Makefile.in  2011-01-15 
08:52:22.0 +0300
 libAfterImage-1.20/aftershow/Makefile.in   2021-05-19 23:32:53.158905472 
+0300
+@@ -11,7 +11,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/apps/Makefile.in 
libAfterImage-1.20/apps/Makefile.in
+--- libAfterImage-1.20.orig/apps/Makefile.in   2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/apps/Makefile.in2021-05-19 23:33:15.769993568 
+0300
+@@ -8,7 +8,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@

diff --git a/media-libs/libafterimage/files/libafterimage-freetype.patch 
b/media-libs/libafterimage/files/libafterimage-freetype.patch
new file mode 100644
index 000..575a68fd7ca
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-freetype.patch
@@ -0,0 +1,23 @@
+--- libAfterImage-1.20.orig/configure.in   2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/configure.in2021-05-19 23:40:50.359764859 +0300
+@@ -561,9 +561,9 @@
+ else
+   if test "x$ttf_includes" = "xno"; then
+ AC_MSG_CHECKING(headers required by TTF support)
+-if freetype-config --cflags >/dev/null  ;then
++if pkg-config freetype2 --cflags >/dev/null  ;then
+ present_incs="$CCFLAGS $x_includes";
+-for l in `freetype-config --cflags` ; do
++for l in `pkg-config freetype2 --cflags` ;do
+   inc_found=no
+   for p in `echo "$present_incs"` ; do
+   if test "x$l" = "x$p" ; then
+@@ -636,7 +636,7 @@
+ have_ttf=yes
+   fi
+   if test "$have_ttf" = yes; then
+-AFTERIMAGE_LIBS="`freetype-config --libs` $AFTERIMAGE_LIBS"
++AFTERIMAGE_LIBS="`pkg-config freetype2 --libs` $AFTERIMAGE_LIBS"
+   fi
+ fi;
+ AC_SUBST(TTF_INCLUDES)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
new file mode 100644
index 000..33cb313ecb7
--- /dev/null
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PN=libAfterImage
+
+DESCRIPTION="Afterstep's standalone generic image manipulation library"
+HOMEPAGE="http://www.afterstep.org/afterimage/index.php;
+SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
+
+RDEPEND="
+   X?  ( x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXrender )
+   gif?(

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2019-07-26 Thread Guilherme Amadio 
commit: b3adf8e32da7fee7a2b14ead041d41f40c14bc0c
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Fri Jul 26 12:56:38 2019 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Fri Jul 26 12:59:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3adf8e3

media-libs/libafterimage: drop opengl USE flag, breaks ROOT GUI

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1704691
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1708922
Bug: https://sft.its.cern.ch/jira/browse/ROOT-10237
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Guilherme Amadio  gentoo.org>

 .../libafterimage/libafterimage-1.20-r3.ebuild | 105 +
 1 file changed, 105 insertions(+)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
new file mode 100644
index 000..4d52a6cc3e2
--- /dev/null
+++ b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+MY_PN=libAfterImage
+
+DESCRIPTION="Afterstep's standalone generic image manipulation library"
+HOMEPAGE="http://www.afterstep.org/afterimage/index.php;
+SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
+
+RDEPEND="
+   X?  ( x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXrender )
+   gif?( media-libs/giflib:0= )
+   jpeg?   ( virtual/jpeg:0 )
+   png?( >=media-libs/libpng-1.4:0= )
+   svg?( gnome-base/librsvg:2 )
+   tiff?   ( media-libs/tiff:0 )
+   truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}
+   X?  ( x11-base/xorg-proto )
+   virtual/pkgconfig
+   !!x11-wm/afterstep"
+REQUIRED_USE="
+   shaping? ( X )
+   shm? ( X )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+   default
+
+   # fix some ldconfig problem in makefile.in
+   eapply -p0 "${FILESDIR}"/${PN}-makefile.in.patch
+   # fix lib paths in afterimage-config
+   eapply -p0 "${FILESDIR}"/${PN}-config.patch
+   # fix gif unbundle
+   eapply -p0 "${FILESDIR}"/${PN}-gif.patch
+   # fix for libpng15 compability
+   eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
+   # add giflib-5 API support, bug 571654
+   eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
+   # do not build examples
+   use examples || sed -i \
+   -e '/^all:/s/apps//' \
+   -e '/^install:/s/install.apps//' \
+   Makefile.in || die "sed failed"
+   # remove forced flags
+   sed -i \
+   -e 's/CFLAGS="-O3"//' \
+   -e 's/ -rdynamic//' \
+   configure.in || die "sed failed"
+
+   mv configure.in configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable cpu_flags_x86_mmx mmx-optimization) \
+   $(use_enable nls i18n) \
+   $(use_enable shaping) \
+   $(use_enable shm shmimage ) \
+   $(use_enable static-libs staticlibs) \
+   $(use_with X x) \
+   $(use_with gif) \
+   $(use_with jpeg) \
+   $(use_with png) \
+   $(use_with svg) \
+   $(use_with tiff) \
+   $(use_with truetype ttf) \
+   --disable-glx \
+   --enable-sharedlibs \
+   --with-xpm \
+   --without-builtin-gif \
+   --without-builtin-jpeg \
+   --without-builtin-png \
+   --without-builtin-zlib \
+   --without-afterbase
+}
+
+src_install() {
+   emake \
+   DESTDIR="${D}" \
+   AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+   install
+   dodoc ChangeLog README
+   if use examples; then
+   cd apps || die
+   mv ascompose.man ascompose.1 || die
+   doman ascompose.1
+   emake clean
+   rm Makefile* ascompose.1 || die
+   insinto /usr/share/doc/${PF}/examples
+   doins *
+   fi
+}

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

2017-01-29 Thread Jeroen Roovers 
commit: 9cb83c1e90f21cfa14c10b66a530071cce27bf37
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 29 21:54:26 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 29 21:59:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb83c1e

media-libs/libafterimage: Old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libafterimage-giflib42.patch |  19 -
 .../files/libafterimage-giflib5.patch  | 382 -
 .../libafterimage/libafterimage-1.20-r1.ebuild | 108 --
 media-libs/libafterimage/libafterimage-1.20.ebuild |  95 -
 4 files changed, 604 deletions(-)

diff --git a/media-libs/libafterimage/files/libafterimage-giflib42.patch 
b/media-libs/libafterimage/files/libafterimage-giflib42.patch
deleted file mode 100644
index b1b1f72..
--- a/media-libs/libafterimage/files/libafterimage-giflib42.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix build failure with giflib 4.2.
-Patch by Andrew Savchenko .
-https://bugs.gentoo.org/486804
-
 libAfterImage-1.20/ungif.h.orig
-+++ libAfterImage-1.20/ungif.h
-@@ -7,6 +7,12 @@
- extern "C" {
- #endif
- 
-+#if (GIFLIB_MAJOR>4) || ((GIFLIB_MAJOR==4) && (GIFLIB_MINOR>=2)) 
-+static inline void PrintGifError(void) {
-+fprintf(stderr, "%s\n", GifErrorString());
-+}
-+#endif
-+
- #ifdef __GNUC__
- #define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> 
",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0)
- #else

diff --git a/media-libs/libafterimage/files/libafterimage-giflib5.patch 
b/media-libs/libafterimage/files/libafterimage-giflib5.patch
deleted file mode 100644
index b650b24..
--- a/media-libs/libafterimage/files/libafterimage-giflib5.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
 libAfterImage-1.20.orig/export.c   2016-05-01 11:44:19.0 +0300
-+++ libAfterImage-1.20/export.c2016-05-02 10:57:59.688984491 +0300
-@@ -1048,6 +1048,9 @@
-   Bool new_image = True ;
-   START_TIME(started);
-   int cmap_size = 1;
-+#if (GIFLIB_MAJOR>=5)
-+  int errcode;
-+#endif
- #define GIF_NETSCAPE_EXT_BYTES 3
-   unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 
0x0};
- #define GIF_GCE_BYTES 4   
-@@ -1086,10 +1089,18 @@
- 
-   while( cmap_size < 256 && cmap_size < 
(int)cmap.count+(gce_bytes[0]&0x01) )
-   cmap_size = cmap_size<<1 ;
-+#if (GIFLIB_MAJOR>=5)
-+  if( (gif_cmap = GifMakeMapObject(cmap_size, NULL )) == NULL )
-+#else
-   if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )
-+#endif
-   {
-   free( mapped_im );
-+#if (GIFLIB_MAJOR>=5)
-+  ASIM_PrintGifError(E_GIF_ERR_NOT_ENOUGH_MEM);
-+#else
-   ASIM_PrintGifError();
-+#endif
-   return False;
-   }
-   memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), 
MIN(cmap.count,(unsigned int)cmap_size)*3 );
-@@ -1101,13 +1112,25 @@
-   SavedImage *images = NULL ;
-   int count = 0 ;
-   /* TODO: do something about multiimage files !!! */
-+#if (GIFLIB_MAJOR>=5)
-+  gif = open_gif_read(infile, );
-+#else
-   gif = open_gif_read(infile);
-+#endif
-   if( gif == NULL || get_gif_saved_images(gif, -1, , 
) == GIF_ERROR)
-   {
-+#if (GIFLIB_MAJOR>=5)
-+  ASIM_PrintGifError(errcode);
-+#else
-   ASIM_PrintGifError();
-+#endif
-   if( gif )
-   {
-+#if (GIFLIB_MAJOR>=5)
-+  DGifCloseFile(gif, );
-+#else
-   DGifCloseFile(gif);
-+#endif
-   gif = NULL ;
-   }
-   if (infile)
-@@ -1123,14 +1146,22 @@
-   gif_src = *gif ;
-   gif->SColorMap = NULL ;
-   gif->Image.ColorMap = NULL ;
-+#if (GIFLIB_MAJOR>=5)
-+DGifCloseFile(gif, );
-+#else
-   DGifCloseFile(gif);
-+#endif
-   gif = NULL;
-   fclose (infile);
-   infile = NULL;
-   outfile = open_writeable_image_file( path );
- 
-   if (outfile)
-+#if (GIFLIB_MAJOR>=5)
-+  gif = EGifOpenFileHandle(fileno(outfile), 
);
-+#else
-   gif = EGifOpenFileHandle(fileno(outfile));
-+#endif
-   
-   if (gif)
-   {
-@@ -1141,26 +1172,46 @@
-  
gif_src.SColorMap )) == GIF_OK )
-   status = write_gif_saved_images( gif, 
images, count );
-   if( status != GIF_OK )
-+#if (GIFLIB_MAJOR>=5)
-+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-29 Thread Jeroen Roovers 
commit: 688b73bcd39312ae260b49357b148552ff271cd3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 29 20:58:23 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 29 20:58:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688b73bc

media-libs/libafterimage: Stable for HPPA (bug #597252).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index 6f7044f..6cf2596 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-25 Thread Tobias Klausmann 
commit: aa09f73259da4568a8b43e918a2806d3bbb4830d
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Jan 25 09:07:58 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Jan 25 09:07:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa09f732

media-libs/libafterimage-1.20-r2: stable on alpha

Gentoo-Bug: 606290

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index 8f3af91..6f7044f 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-23 Thread Agostino Sarubbo 
commit: f5ac099631564f501b40d158ea92a1ec716c5d91
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jan 23 16:24:53 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jan 23 16:27:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5ac0996

media-libs/libafterimage: ia64 stable wrt bug #606290

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index 557e7e7..8f3af91 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-22 Thread Agostino Sarubbo 
commit: 18591659c8d0237a76748fe19af4344a1e9adb3f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 22 16:25:08 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 22 16:27:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18591659

media-libs/libafterimage: sparc stable wrt bug #606290

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index 95f8b1a..557e7e7 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-21 Thread Agostino Sarubbo 
commit: ea9bf565cd05161a3cd7c72f484613122e01643b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jan 21 20:28:40 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jan 21 20:33:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9bf565

media-libs/libafterimage: ppc stable wrt bug #606290

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index 4d376a0..95f8b1a 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-20 Thread Agostino Sarubbo 
commit: 0efff38d3e5dbf7977b1442a6a31524580950087
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 20 11:03:32 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 20 11:04:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0efff38d

media-libs/libafterimage: ppc64 stable wrt bug #606290

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index cda4ef8..4d376a0 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-19 Thread Agostino Sarubbo 
commit: b67ba8e5254c52dd3092dda7b84db09628998234
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jan 19 10:57:52 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jan 19 10:57:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67ba8e5

media-libs/libafterimage: x86 stable wrt bug #606290

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index 54d7430..cda4ef8 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2017-01-18 Thread Agostino Sarubbo 
commit: bfee117ac86999babbe42a11ca7619e0f5921dc8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 18 16:50:40 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 18 16:52:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfee117a

media-libs/libafterimage: amd64 stable wrt bug #606290

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index 3b73b63..54d7430 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

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

2017-01-17 Thread Andrew Savchenko 
commit: 1565ff5da7b321093f3b6e72597bee214c7c08f2
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Tue Jan 17 22:35:23 2017 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Tue Jan 17 22:35:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1565ff5d

media-libs/libafterimage: fix invalid casts, see bug 571654

Fix invalid pointer usage as pointed out by Oliver Freyermuth
 googlemail.com>, bug 571654, comment 23 which may
lead to ROOT crash (comment 22).
Patch by  Oliver Freyermuth, comment 24.

Also fix pointer signedness issue in import.c:2227.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../files/libafterimage-giflib5-v2.patch   | 391 +
 .../libafterimage/libafterimage-1.20-r2.ebuild | 108 ++
 2 files changed, 499 insertions(+)

diff --git a/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch 
b/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch
new file mode 100644
index ..85afd53
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch
@@ -0,0 +1,391 @@
+diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
+--- libAfterImage-1.20.orig/export.c   2016-05-01 11:44:19.0 +0300
 libAfterImage-1.20/export.c2016-05-02 10:57:59.688984491 +0300
+@@ -1048,6 +1048,9 @@
+   Bool new_image = True ;
+   START_TIME(started);
+   int cmap_size = 1;
++#if (GIFLIB_MAJOR>=5)
++  int errcode;
++#endif
+ #define GIF_NETSCAPE_EXT_BYTES 3
+   unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 
0x0};
+ #define GIF_GCE_BYTES 4   
+@@ -1086,10 +1089,18 @@
+ 
+   while( cmap_size < 256 && cmap_size < 
(int)cmap.count+(gce_bytes[0]&0x01) )
+   cmap_size = cmap_size<<1 ;
++#if (GIFLIB_MAJOR>=5)
++  if( (gif_cmap = GifMakeMapObject(cmap_size, NULL )) == NULL )
++#else
+   if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )
++#endif
+   {
+   free( mapped_im );
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(E_GIF_ERR_NOT_ENOUGH_MEM);
++#else
+   ASIM_PrintGifError();
++#endif
+   return False;
+   }
+   memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), 
MIN(cmap.count,(unsigned int)cmap_size)*3 );
+@@ -1101,13 +1112,25 @@
+   SavedImage *images = NULL ;
+   int count = 0 ;
+   /* TODO: do something about multiimage files !!! */
++#if (GIFLIB_MAJOR>=5)
++  gif = open_gif_read(infile, );
++#else
+   gif = open_gif_read(infile);
++#endif
+   if( gif == NULL || get_gif_saved_images(gif, -1, , 
) == GIF_ERROR)
+   {
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(errcode);
++#else
+   ASIM_PrintGifError();
++#endif
+   if( gif )
+   {
++#if (GIFLIB_MAJOR>=5)
++  DGifCloseFile(gif, );
++#else
+   DGifCloseFile(gif);
++#endif
+   gif = NULL ;
+   }
+   if (infile)
+@@ -1123,14 +1146,22 @@
+   gif_src = *gif ;
+   gif->SColorMap = NULL ;
+   gif->Image.ColorMap = NULL ;
++#if (GIFLIB_MAJOR>=5)
++DGifCloseFile(gif, );
++#else
+   DGifCloseFile(gif);
++#endif
+   gif = NULL;
+   fclose (infile);
+   infile = NULL;
+   outfile = open_writeable_image_file( path );
+ 
+   if (outfile)
++#if (GIFLIB_MAJOR>=5)
++  gif = EGifOpenFileHandle(fileno(outfile), 
);
++#else
+   gif = EGifOpenFileHandle(fileno(outfile));
++#endif
+   
+   if (gif)
+   {
+@@ -1141,26 +1172,46 @@
+  
gif_src.SColorMap )) == GIF_OK )
+   status = write_gif_saved_images( gif, 
images, count );
+   if( status != GIF_OK )
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(status);
++#else
+   ASIM_PrintGifError();
++#endif
+   }
+   if (gif_src.SColorMap)
+   {  /* we only want to save private colormap if it is 
any different from
+   * screen colormap ( saves us  768 bytes per image ) 
*/
+   if( gif_cmap->ColorCount == 
gif_src.SColorMap->ColorCount )
+   dont_save_cmap = ( memcmp( 
gif_cmap->Colors, gif_src.SColorMap->Colors, 
gif_cmap->ColorCount*sizeof(GifColorType)) == 0 );

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2016-11-22 Thread Marek Szuba 
commit: 0d25b059ac783e6967d7cc7e909f4fb9db4f2ea5
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov 22 23:40:11 2016 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov 22 23:41:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d25b059

media-libs/libafterimage-1.20-r1: stable on amd64

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=597252

Package-Manager: portage-2.3.2

 media-libs/libafterimage/libafterimage-1.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
index bf99144..d1dd0c6 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2016-11-15 Thread Tobias Klausmann 
commit: 51e932b9b497769f046663b30e710c856bc0596d
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Nov 15 15:34:02 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Nov 15 15:34:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e932b9

media-libs/libafterimage-1.20-r1: stable on alpha

Gentoo-Bug: 597252

 media-libs/libafterimage/libafterimage-1.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
index a5d5d12..bf99144 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2016-10-16 Thread Pacho Ramos 
commit: cefbc2e8425efcb66b78f2364f605ea7088ac653
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 16 08:57:48 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 16 08:57:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cefbc2e8

media-libs/libafterimage: Pin slots

Package-Manager: portage-2.3.1

 media-libs/libafterimage/libafterimage-1.20-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
index 8d289c3..a5d5d12 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
@@ -20,11 +20,11 @@ RDEPEND="
X?  ( x11-libs/libSM
  x11-libs/libXext
  x11-libs/libXrender )
-   gif?( media-libs/giflib )
-   jpeg?   ( virtual/jpeg:= )
+   gif?( media-libs/giflib:0= )
+   jpeg?   ( virtual/jpeg:0 )
opengl? ( virtual/opengl )
-   png?( >=media-libs/libpng-1.4:0 )
-   svg?( gnome-base/librsvg )
+   png?( >=media-libs/libpng-1.4:0= )
+   svg?( gnome-base/librsvg:2 )
tiff?   ( media-libs/tiff:0 )
truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}

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

2016-05-08 Thread Andrew Savchenko 
commit: bc04ac3d16115fd75cfa89b3907bec80c3499359
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May  8 07:21:08 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun May  8 07:21:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc04ac3d

media-libs/libafterimage: fix bug 582308

libjpeg provides some macro that were removed in >=giflib-5, so
with USE="gif -jpeg" and >=giflib-5 we had undefined TRUE and
FALSE.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/libafterimage/files/libafterimage-giflib5.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libafterimage/files/libafterimage-giflib5.patch 
b/media-libs/libafterimage/files/libafterimage-giflib5.patch
index 32037d9..b650b24 100644
--- a/media-libs/libafterimage/files/libafterimage-giflib5.patch
+++ b/media-libs/libafterimage/files/libafterimage-giflib5.patch
@@ -117,7 +117,7 @@ diff -Naurd libAfterImage-1.20.orig/export.c 
libAfterImage-1.20/export.c
}

 +#if (GIFLIB_MAJOR>=5)
-+  if( (errcode = EGifPutImageDesc(gif, 0, 0, 
im->width, im->height, FALSE, (dont_save_cmap)?NULL:gif_cmap )) == GIF_ERROR )
++  if( (errcode = EGifPutImageDesc(gif, 0, 0, 
im->width, im->height, false, (dont_save_cmap)?NULL:gif_cmap )) == GIF_ERROR )
 +  ASIM_PrintGifError(errcode);
 +#else
if( EGifPutImageDesc(gif, 0, 0, im->width, 
im->height, FALSE, (dont_save_cmap)?NULL:gif_cmap ) == GIF_ERROR )
@@ -155,7 +155,7 @@ diff -Naurd libAfterImage-1.20.orig/export.c 
libAfterImage-1.20/export.c
EGifPutExtension(gif, 0xf9, GIF_GCE_BYTES, &(gce_bytes[0]));

 +#if (GIFLIB_MAJOR>=5)
-+  if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, 
im->height, FALSE, NULL )) == GIF_ERROR )
++  if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, 
im->height, false, NULL )) == GIF_ERROR )
 +  ASIM_PrintGifError(errcode);
 +#else
if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, 
NULL ) == GIF_ERROR )

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

2016-05-02 Thread Andrew Savchenko 
commit: 3d5b16d3365e80c281e9131e011a6d88ddf61167
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon May  2 15:51:22 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Mon May  2 15:51:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5b16d3

media-libs/libafterimage-1.20-r1: fix bug 571654

- port to giflib-5 API;
- update ebuild to EAPI 6;
- add new USE flags and deps for previously ignored dependencies.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../files/libafterimage-giflib5.patch  | 382 +
 .../libafterimage/libafterimage-1.20-r1.ebuild | 108 ++
 media-libs/libafterimage/metadata.xml  |   4 +
 3 files changed, 494 insertions(+)

diff --git a/media-libs/libafterimage/files/libafterimage-giflib5.patch 
b/media-libs/libafterimage/files/libafterimage-giflib5.patch
new file mode 100644
index 000..32037d9
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-giflib5.patch
@@ -0,0 +1,382 @@
+diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
+--- libAfterImage-1.20.orig/export.c   2016-05-01 11:44:19.0 +0300
 libAfterImage-1.20/export.c2016-05-02 10:57:59.688984491 +0300
+@@ -1048,6 +1048,9 @@
+   Bool new_image = True ;
+   START_TIME(started);
+   int cmap_size = 1;
++#if (GIFLIB_MAJOR>=5)
++  int errcode;
++#endif
+ #define GIF_NETSCAPE_EXT_BYTES 3
+   unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 
0x0};
+ #define GIF_GCE_BYTES 4   
+@@ -1086,10 +1089,18 @@
+ 
+   while( cmap_size < 256 && cmap_size < 
(int)cmap.count+(gce_bytes[0]&0x01) )
+   cmap_size = cmap_size<<1 ;
++#if (GIFLIB_MAJOR>=5)
++  if( (gif_cmap = GifMakeMapObject(cmap_size, NULL )) == NULL )
++#else
+   if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )
++#endif
+   {
+   free( mapped_im );
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(E_GIF_ERR_NOT_ENOUGH_MEM);
++#else
+   ASIM_PrintGifError();
++#endif
+   return False;
+   }
+   memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), 
MIN(cmap.count,(unsigned int)cmap_size)*3 );
+@@ -1101,13 +1112,25 @@
+   SavedImage *images = NULL ;
+   int count = 0 ;
+   /* TODO: do something about multiimage files !!! */
++#if (GIFLIB_MAJOR>=5)
++  gif = open_gif_read(infile, );
++#else
+   gif = open_gif_read(infile);
++#endif
+   if( gif == NULL || get_gif_saved_images(gif, -1, , 
) == GIF_ERROR)
+   {
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(errcode);
++#else
+   ASIM_PrintGifError();
++#endif
+   if( gif )
+   {
++#if (GIFLIB_MAJOR>=5)
++  DGifCloseFile(gif, );
++#else
+   DGifCloseFile(gif);
++#endif
+   gif = NULL ;
+   }
+   if (infile)
+@@ -1123,14 +1146,22 @@
+   gif_src = *gif ;
+   gif->SColorMap = NULL ;
+   gif->Image.ColorMap = NULL ;
++#if (GIFLIB_MAJOR>=5)
++DGifCloseFile(gif, );
++#else
+   DGifCloseFile(gif);
++#endif
+   gif = NULL;
+   fclose (infile);
+   infile = NULL;
+   outfile = open_writeable_image_file( path );
+ 
+   if (outfile)
++#if (GIFLIB_MAJOR>=5)
++  gif = EGifOpenFileHandle(fileno(outfile), 
);
++#else
+   gif = EGifOpenFileHandle(fileno(outfile));
++#endif
+   
+   if (gif)
+   {
+@@ -1141,26 +1172,46 @@
+  
gif_src.SColorMap )) == GIF_OK )
+   status = write_gif_saved_images( gif, 
images, count );
+   if( status != GIF_OK )
++#if (GIFLIB_MAJOR>=5)
++  ASIM_PrintGifError(status);
++#else
+   ASIM_PrintGifError();
++#endif
+   }
+   if (gif_src.SColorMap)
+   {  /* we only want to save private colormap if it is 
any different from
+   * screen colormap ( saves us  768 bytes per image ) 
*/
+   if( gif_cmap->ColorCount == 
gif_src.SColorMap->ColorCount )
+   dont_save_cmap = ( memcmp( 
gif_cmap->Colors, gif_src.SColorMap->Colors, 
gif_cmap->ColorCount*sizeof(GifColorType)) == 0 );
++#if (GIFLIB_MAJOR>=5)
++  GifFreeMapObject(gif_src.SColorMap);

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2016-05-02 Thread Andrew Savchenko 
commit: 022acc88b2bdfe2e11cb4d94cff378572b9dc597
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon May  2 15:47:23 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Mon May  2 15:51:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022acc88

media-libs/libafterimage: update deps

- 1.20 doesn't work with giflib >= 5;
- add jpeg subslot dep.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild 
b/media-libs/libafterimage/libafterimage-1.20.ebuild
index 9b5da9c..16418da 100644
--- a/media-libs/libafterimage/libafterimage-1.20.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,8 +21,8 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXrender
png?  ( >=media-libs/libpng-1.4:0 )
-   jpeg? ( virtual/jpeg )
-   gif?  ( media-libs/giflib )
+   jpeg? ( virtual/jpeg:= )
+   gif?  (