Remove old.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 5 insertions, 204 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 2ef7162b46ef..a9b1cf7d400f 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.27 2012/12/10 18:37:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.28 2012/12/10 18:39:49 radhermit Exp $
+
+  10 Dec 2012; Tim Harder <radhermit@gentoo.org> -darktable-1.1.ebuild,
+  -files/darktable-1.1-system-libraw.patch:
+  Remove old.
 
   10 Dec 2012; Tim Harder <radhermit@gentoo.org> darktable-1.1.1.ebuild:
   Fix user manual install (bug #446704).
diff --git a/media-gfx/darktable/darktable-1.1.ebuild b/media-gfx/darktable/darktable-1.1.ebuild
deleted file mode 100644
index fc57ad42b1c3..000000000000
--- a/media-gfx/darktable/darktable-1.1.ebuild
+++ /dev/null
@@ -1,117 +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.1.ebuild,v 1.2 2012/12/09 00:04:51 radhermit Exp $
-
-EAPI="5"
-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="colord debug facebook flickr geo gnome gphoto2 kde nls opencl openmp +rawspeed
-+slideshow video_cards_nvidia"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/libxml2:2
-	colord? ( x11-misc/colord )
-	facebook? ( dev-libs/json-glib )
-	flickr? ( media-libs/flickcurl )
-	geo? ( net-libs/libsoup:2.4 )
-	gnome? (
-		gnome-base/gconf
-		gnome-base/gnome-keyring
-	)
-	gnome-base/librsvg:2
-	gphoto2? ( media-libs/libgphoto2 )
-	kde? (
-		dev-libs/dbus-glib
-		kde-base/kwalletd
-	)
-	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/glu
-		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}"/${P}-system-libraw.patch
-	"${FILESDIR}"/${P}-opencl-kernels.patch
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-automagic-colord.patch
-)
-
-openmp_check() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-pkg_pretend() {
-	openmp_check
-}
-
-pkg_setup() {
-	openmp_check
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_use facebook GLIBJSON)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use geo GEO)
-		$(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)
-		-DDONT_INSTALL_GCONF_SCHEMAS=$(usex gnome OFF ON)
-		-DUSE_OPENCL=$(usex opencl ON OFF)
-		-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
-
-	# remove unnecessary file (bug #446516)
-	rm "${D}"/usr/share/darktable/js/.DS_Store || die
-}
diff --git a/media-gfx/darktable/files/darktable-1.1-system-libraw.patch b/media-gfx/darktable/files/darktable-1.1-system-libraw.patch
deleted file mode 100644
index 6e963441e8a5..000000000000
--- a/media-gfx/darktable/files/darktable-1.1-system-libraw.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- darktable-1.1/cmake/modules/FindLibraw.cmake
-+++ darktable-1.1/cmake/modules/FindLibraw.cmake
-@@ -0,0 +1,29 @@
-+# - Try to find libraw
-+# Once done, this will define
-+#
-+#  Libraw_FOUND - system has Libraw
-+#  Libraw_INCLUDE_DIRS - the Libraw include directories
-+#  Libraw_LIBRARIES - link these to use Libraw
-+
-+include(LibFindMacros)
-+
-+# Use pkg-config to get hints about paths
-+libfind_pkg_check_modules(Libraw_PKGCONF libraw)
-+
-+# Include dir
-+find_path(Libraw_INCLUDE_DIR
-+  NAMES libraw.h
-+  PATHS ${Libraw_PKGCONF_INCLUDE_DIRS}
-+)
-+
-+# Finally the library itself
-+find_library(Libraw_LIBRARY
-+  NAMES raw_r
-+  PATHS ${Libraw_PKGCONF_LIBRARY_DIRS}
-+)
-+
-+# Set the include dir variables and the libraries and let libfind_process do the rest.
-+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-+set(Libraw_PROCESS_INCLUDES Libraw_INCLUDE_DIR Libraw_INCLUDE_DIRS)
-+set(Libraw_PROCESS_LIBS Libraw_LIBRARY Libraw_LIBRARIES)
-+libfind_process(Libraw)
---- darktable-1.1/src/CMakeLists.txt
-+++ darktable-1.1/src/CMakeLists.txt
-@@ -86,7 +86,6 @@
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/osm-gps-map/src)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/colord-gtk/src)
- 
-@@ -143,7 +142,7 @@
- endif(INOTIFY_FOUND)
- 
- # Find all the libs that don't require extra parameters
--foreach(lib ${OUR_LIBS} LensFun GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
-+foreach(lib ${OUR_LIBS} LensFun Libraw GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 Sqlite3 Exiv2 CURL PNG JPEG TIFF OpenEXR LCMS2)
-   find_package(${lib} REQUIRED)
-   include_directories(${${lib}_INCLUDE_DIRS})
-   list(APPEND LIBS ${${lib}_LIBRARIES})
-@@ -366,24 +365,6 @@
- set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable)
- set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
- 
--#
--# the libraw part is a bit of a hack:
--# the static linking didn't work since it was pulling -lstdc++ and -lm into linker flags.
--# so we do a custom dependency and pretend an imported liblibraw_r.a so no other -l are
--# appended.
--#
--add_dependencies(lib_darktable libraw_r)
--add_library(libraw_static STATIC IMPORTED)
--set_target_properties(libraw_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/LibRaw/liblibraw_r.a)
--if(APPLE)
--  set(LIBRAW_STATIC_LIBS libraw_static stdc++)
--else(APPLE)
--  set(LIBRAW_STATIC_LIBS libraw_static)
--endif(APPLE)
--
--target_link_libraries(lib_darktable ${LIBRAW_STATIC_LIBS})
--list(APPEND STATIC_LIBS ${LIBRAW_STATIC_LIBS})
--
- # same for librawspeed (can switch it off with -DDONT_USE_RAWSPEED, for macs):
- if(NOT DONT_USE_RAWSPEED)
-   add_definitions("-DHAVE_RAWSPEED")
-@@ -448,9 +429,6 @@
- # make sure static libs is first
- list(INSERT LIBS 0 lib_darktable ${STATIC_LIBS})
- 
--# Compile libraw modules
--add_subdirectory(external/LibRaw)
--
- # Compile views modules
- add_subdirectory(views)
-