summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2013-03-29 23:05:39 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2013-03-29 23:05:39 +0000
commit1adb1d1c79f00dcb4410d3021d3208efacefd316 (patch)
tree69b32bdcc26139bcd7e31163a1b41380cd5c0aac /media-gfx
parentClean up old revision. (diff)
downloadgentoo-2-1adb1d1c79f00dcb4410d3021d3208efacefd316.tar.gz
gentoo-2-1adb1d1c79f00dcb4410d3021d3208efacefd316.tar.bz2
gentoo-2-1adb1d1c79f00dcb4410d3021d3208efacefd316.zip
Clean up old revision.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/gphoto2/ChangeLog8
-rw-r--r--media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch19
-rw-r--r--media-gfx/gphoto2/gphoto2-2.4.11.ebuild56
3 files changed, 6 insertions, 77 deletions
diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog
index a62309a30d5a..34dc2328b397 100644
--- a/media-gfx/gphoto2/ChangeLog
+++ b/media-gfx/gphoto2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/gphoto2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.130 2012/10/28 16:02:36 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.131 2013/03/29 23:05:39 eva Exp $
+
+ 29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -gphoto2-2.4.11.ebuild,
+ -files/gphoto2-2.4.11-cdk-libs.patch:
+ Clean up old revision.
28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gphoto2-2.4.14.ebuild:
sparc stable wrt #427544
diff --git a/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch b/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch
deleted file mode 100644
index 2e7a89a9f5cd..000000000000
--- a/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gphoto2-2.4.11/configure.ac.orig
-+++ gphoto2-2.4.11/configure.ac
-@@ -146,8 +146,14 @@
- CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
- AC_CHECK_HEADER([cdk/cdk.h], [
- have_cdk=:
-- CDK_CFLAGS="-I$cdk_prefix/include"
-- CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses"
-+ AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
-+ if test -n "${CDK_CONFIG}"; then
-+ CDK_CFLAGS=`$CDK_CONFIG --cflags`
-+ CDK_LIBS=`$CDK_CONFIG --libs`
-+ else
-+ CDK_CFLAGS="-I$cdk_prefix/include"
-+ CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses"
-+ fi
- AC_DEFINE([HAVE_CDK],1,[whether we have CDK])
- LDFLAGS_save="$LDFLAGS"
- LDFLAGS="$CDK_LIBS"
diff --git a/media-gfx/gphoto2/gphoto2-2.4.11.ebuild b/media-gfx/gphoto2/gphoto2-2.4.11.ebuild
deleted file mode 100644
index 2100b304a6cc..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.4.11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.11.ebuild,v 1.8 2012/05/05 07:00:27 jdhore Exp $
-
-EAPI="4"
-
-inherit eutils 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 hppa ppc ppc64 sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-# raise libgphoto to get a proper .pc
-RDEPEND="virtual/libusb:0
- dev-libs/popt
- >=media-libs/libgphoto2-2.4.11[exif?]
- ncurses? ( dev-libs/cdk )
- aalib? (
- media-libs/aalib
- virtual/jpeg:0 )
- exif? ( media-libs/libexif )
- readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( >=sys-devel/gettext-0.14 )"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-cdk-libs.patch"
- eautoreconf
-}
-
-src_configure() {
- CPPFLAGS="-I/usr/include/cdk" econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_with aalib) \
- $(use_with aalib jpeg) \
- $(use_with exif libexif auto) \
- $(use_with ncurses cdk) \
- $(use_enable nls) \
- $(use_with readline)
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
- install
-
- dodoc ChangeLog NEWS* README AUTHORS || die "dodoc failed"
- rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
-}