commit: c21cb39e53a74ba01e78a387e6a048e6826988f5 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Wed Apr 3 16:02:30 2024 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Wed Apr 3 16:03:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21cb39e
gnustep-base/gnustep-gui: giflib is a hard dependency Closes: https://bugs.gentoo.org/927743 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> ...ep-gui-0.29.0-r1.ebuild => gnustep-gui-0.29.0-r2.ebuild} | 13 +++++-------- ...ep-gui-0.30.0-r1.ebuild => gnustep-gui-0.30.0-r2.ebuild} | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r2.ebuild similarity index 82% rename from gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r1.ebuild rename to gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r2.ebuild index 2f19d72bcb7b..68d961c1b3f3 100644 --- a/gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r1.ebuild +++ b/gnustep-base/gnustep-gui/gnustep-gui-0.29.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,16 +11,16 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux" -IUSE="cups gif icu jpeg png speech" +IUSE="cups icu jpeg png speech" DEPEND="${GNUSTEP_CORE_DEPEND} app-text/aspell >=gnustep-base/gnustep-base-1.28.0:=[icu?] media-libs/audiofile + >=media-libs/giflib-4.1:= >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) - gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.2:= ) @@ -40,18 +40,15 @@ src_prepare() { src_configure() { egnustep_env - local myconf= - use gif && myconf="--disable-ungif --enable-libgif" - econf \ $(use_enable cups) \ $(use_enable icu) \ $(use_enable jpeg) \ $(use_enable png) \ $(use_enable speech) \ + --disable-ungif --enable-libgif \ --with-tiff-include="${EPREFIX}"/usr/include \ - --with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} + --with-tiff-library="${EPREFIX}"/usr/$(get_libdir) } src_test() { diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r2.ebuild similarity index 82% rename from gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild rename to gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r2.ebuild index 266a0fd9a8f9..8e05ac1920b1 100644 --- a/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r1.ebuild +++ b/gnustep-base/gnustep-gui/gnustep-gui-0.30.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,16 +11,16 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cups gif icu jpeg png speech" +IUSE="cups icu jpeg png speech" DEPEND="${GNUSTEP_CORE_DEPEND} app-text/aspell >=gnustep-base/gnustep-base-1.28.0:=[icu?] media-libs/audiofile + >=media-libs/giflib-4.1:= >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) - gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.2:= ) @@ -42,18 +42,15 @@ src_prepare() { src_configure() { egnustep_env - local myconf= - use gif && myconf="--disable-ungif --enable-libgif" - econf \ $(use_enable cups) \ $(use_enable icu) \ $(use_enable jpeg) \ $(use_enable png) \ $(use_enable speech) \ + --disable-ungif --enable-libgif \ --with-tiff-include="${EPREFIX}"/usr/include \ - --with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} + --with-tiff-library="${EPREFIX}"/usr/$(get_libdir) } src_test() {
