commit:     9800c39e180a20e46ef1536ef03541b4614ad256
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 15:49:50 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 16:12:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9800c39e

media-gfx/gphoto2: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-gfx/gphoto2/Manifest                         |  1 -
 ...ted-automagic-activation-of-aalib-support.patch | 37 --------------
 media-gfx/gphoto2/gphoto2-2.5.20.ebuild            | 57 ----------------------
 3 files changed, 95 deletions(-)

diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 270a115dfb4..29ce7041731 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,2 +1 @@
-DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 
6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d
 SHA512 
0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 
20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098
 SHA512 
fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47

diff --git 
a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
 
b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
deleted file mode 100644
index 8e78578d71d..00000000000
--- 
a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 45fb2a39195b5b31f61f376323ff78ab40940760 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <e...@gentoo.org>
-Date: Sat, 8 Dec 2018 16:19:35 +0100
-Subject: [PATCH] Fix unwanted automagic activation of aalib support
-
----
- configure.ac | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a6068c9..c19fed9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -306,8 +306,9 @@ aa_msg="no 
(http://www.sourceforge.net/projects/aa-project)"
- try_aa=:
- have_aa=false
- AC_ARG_WITH([aalib],AS_HELP_STRING([--with-aalib],[Do use aalib for preview 
ASCII rendering]),[
--        if test x$withval = xyes; then
--                try_aa=:
-+        if test x$withval = xno; then
-+                try_aa=false
-+                aa_msg="no (not requested)"
-         fi
- ])
- if $try_aa; then
-@@ -323,8 +324,6 @@ if $try_aa; then
-                         AA_LIBS="-laa"
-                 fi
-       ])
--else
--        aa_msg="no (not requested)"
- fi
- AM_CONDITIONAL([HAVE_AA], [$have_aa])
- AC_SUBST([AA_LIBS])
--- 
-2.19.2
-

diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild 
b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
deleted file mode 100644
index 0bd55c88a10..00000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/";
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-RDEPEND="
-       dev-libs/popt
-       >=media-libs/libgphoto2-2.5.17:=[exif?]
-       aalib? (
-               media-libs/aalib
-               virtual/jpeg:0 )
-       exif? ( media-libs/libexif )
-       ncurses? ( dev-libs/cdk:0= )
-       readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-PATCHES=(
-       # https://github.com/gphoto/gphoto2/pull/179
-       
"${FILESDIR}"/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
-)
-
-src_prepare() {
-       default
-       if ! use exif ; then
-               # Remove tests that require EXIF to pass, bug 610024
-               rm "${S}"/tests/data/test0{35,36,37,40}* || die
-       fi
-       # Leave GCC debug builds under user control
-       sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-               -i configure{.ac,} || die
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               $(use_with aalib) \
-               $(use_with aalib jpeg) \
-               $(use_with exif libexif auto) \
-               $(use_with ncurses cdk) \
-               $(use_enable nls) \
-               $(use_with readline)
-}

Reply via email to