summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-08-01 07:30:34 +0000
committerTim Harder <radhermit@gentoo.org>2012-08-01 07:30:34 +0000
commit05485c709fff29967db72e0627408d6883060b0d (patch)
tree9a8894ff9cdc7cf5744fe0216cc4356f435d77f5
parentVersion bump. (diff)
downloadgentoo-2-05485c709fff29967db72e0627408d6883060b0d.tar.gz
gentoo-2-05485c709fff29967db72e0627408d6883060b0d.tar.bz2
gentoo-2-05485c709fff29967db72e0627408d6883060b0d.zip
Remove old.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
-rw-r--r--media-gfx/darktable/ChangeLog6
-rw-r--r--media-gfx/darktable/darktable-1.0.ebuild99
-rw-r--r--media-gfx/darktable/files/darktable-1.0-cflags.patch44
-rw-r--r--media-gfx/darktable/files/darktable-1.0-no-gphoto2.patch28
4 files changed, 5 insertions, 172 deletions
diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 25e616643b44..4a799b25c467 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/darktable
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.19 2012/08/01 07:27:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.20 2012/08/01 07:30:33 radhermit Exp $
+
+ 01 Aug 2012; Tim Harder <radhermit@gentoo.org> -darktable-1.0.ebuild,
+ -files/darktable-1.0-cflags.patch, -files/darktable-1.0-no-gphoto2.patch:
+ Remove old.
*darktable-1.0.5 (01 Aug 2012)
diff --git a/media-gfx/darktable/darktable-1.0.ebuild b/media-gfx/darktable/darktable-1.0.ebuild
deleted file mode 100644
index 467ab27b1a23..000000000000
--- a/media-gfx/darktable/darktable-1.0.ebuild
+++ /dev/null
@@ -1,99 +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/darktable/darktable-1.0.ebuild,v 1.2 2012/05/05 07:00:22 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils cmake-utils toolchain-funcs
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://darktable.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug flickr gnome gphoto2 kde nls opencl openmp +rawspeed +slideshow video_cards_nvidia"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/libxml2:2
- flickr? ( media-libs/flickcurl )
- gnome? (
- gnome-base/gconf
- gnome-base/gnome-keyring
- )
- gnome-base/librsvg:2
- gphoto2? ( media-libs/libgphoto2 )
- kde? ( dev-libs/dbus-glib )
- media-gfx/exiv2[xmp]
- media-libs/lcms:2
- >=media-libs/lensfun-0.2.3
- media-libs/libpng
- >=media-libs/libraw-0.13.4[demosaic]
- media-libs/openexr
- media-libs/tiff
- net-misc/curl
- opencl? ( virtual/opencl )
- slideshow? (
- media-libs/libsdl
- virtual/opengl
- )
- virtual/jpeg
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.3-system-libraw.patch
- "${FILESDIR}"/${PN}-0.9.3-no-rawspeed.patch
- "${FILESDIR}"/${PN}-0.9.3-opencl-kernels.patch
- "${FILESDIR}"/${P}-cflags.patch
- "${FILESDIR}"/${P}-no-gphoto2.patch
-)
-
-pkg_setup() {
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-}
-
-src_prepare() {
- base_src_prepare
- sed -i -e "s:\(/share/doc/\)darktable:\1${PF}:" \
- -e "s:LICENSE::" doc/CMakeLists.txt || die
-}
-
-src_configure() {
- local myconf
- myconf="-DDONT_INSTALL_GCONF_SCHEMAS=$(usex gnome OFF ON)"
- myconf+=" -DUSE_OPENCL=$(usex opencl ON OFF)"
-
- use debug && CMAKE_BUILD_TYPE=Debug
-
- mycmakeargs=(
- $(cmake-utils_use_use flickr FLICKR)
- $(cmake-utils_use_use gnome GCONF_BACKEND)
- $(cmake-utils_use_use gnome GNOME_KEYRING)
- $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
- $(cmake-utils_use_use kde KWALLET)
- $(cmake-utils_use_use nls NLS)
- $(cmake-utils_use_use openmp OPENMP)
- $(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
- $(cmake-utils_use_build slideshow SLIDESHOW)
- ${myconf}
- -DINSTALL_IOP_EXPERIMENTAL=ON
- -DINSTALL_IOP_LEGACY=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
- cmake-utils_src_install
- unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-}
diff --git a/media-gfx/darktable/files/darktable-1.0-cflags.patch b/media-gfx/darktable/files/darktable-1.0-cflags.patch
deleted file mode 100644
index 88841a04759f..000000000000
--- a/media-gfx/darktable/files/darktable-1.0-cflags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- darktable-1.0/src/CMakeLists.txt
-+++ darktable-1.0/src/CMakeLists.txt
-@@ -233,40 +233,12 @@
- # c++ code doesn't like -Werror (libraw)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
-
--if(NOT APPLE)
-- # apple build fails on deprecated warnings..
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
--endif(NOT APPLE)
--
- if(NOT WIN32)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
- endif(NOT WIN32)
-
--if(NOT BINARY_PACKAGE_BUILD)
-- MESSAGE("-- Checking for -march=native support")
-- CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
-- if (MARCHNATIVE)
-- set(MARCH "-march=native")
-- else()
-- MESSAGE("-- Checking for -mtune=native support")
-- CHECK_C_COMPILER_FLAG("-mtune=native" MTUNENATIVE)
-- if (MTUNENATIVE)
-- set(MARCH "-mtune=native")
-- else()
-- set(MARCH "-mtune=generic")
-- endif()
-- endif()
--else()
-- set(MARCH "-mtune=generic")
--endif()
-+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
-
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse -g")
--set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
--set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse -g")
--set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
--set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
--
-
- #
- # Generate config.h
diff --git a/media-gfx/darktable/files/darktable-1.0-no-gphoto2.patch b/media-gfx/darktable/files/darktable-1.0-no-gphoto2.patch
deleted file mode 100644
index 3ef088cbe273..000000000000
--- a/media-gfx/darktable/files/darktable-1.0-no-gphoto2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- darktable-1.0/src/libs/import.c
-+++ darktable-1.0/src/libs/import.c
-@@ -28,13 +28,13 @@
- #include "dtgtk/button.h"
- #include "gui/accelerators.h"
- #include "gui/gtk.h"
-+#ifdef HAVE_GPHOTO2
- #include "gui/camera_import_dialog.h"
-+#endif
- #include "libs/lib.h"
-
- DT_MODULE(1)
-
--// #ifdef HAVE_GPHOTO2
--
-
- #ifdef HAVE_GPHOTO2
- /** helper function to update ui with available cameras and ther actionbuttons */
-@@ -44,7 +44,9 @@
-
- typedef struct dt_lib_import_t
- {
-+#ifdef HAVE_GPHOTO2
- dt_camctl_listener_t camctl_listener;
-+#endif
- GtkButton *import_file;
- GtkButton *import_directory;
- GtkButton *import_camera;