Version bump; remove old

(Portage version: 2.1.10.34/cvs/Linux x86_64)

4 files changed, 10 insertions, 75 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 20be384aeeda..c198ba7ad96d 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.200 2011/10/19 19:11:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.201 2011/11/12 15:52:28 dilfridge Exp $
+
+*digikam-2.3.0 (12 Nov 2011)
+
+  12 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/digikam-2.0.0-tests-1.patch, -files/digikam-2.0.0-underlinking.patch,
+  -digikam-2.1.0-r2.ebuild, +digikam-2.3.0.ebuild:
+  Version bump; remove old
 
   19 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-2.1.0-r2.ebuild, digikam-2.2.0.ebuild:
diff --git a/media-gfx/digikam/digikam-2.1.0-r2.ebuild b/media-gfx/digikam/digikam-2.3.0.ebuild
index 701954717dbf..4866302c0ad7 100644
--- a/media-gfx/digikam/digikam-2.1.0-r2.ebuild
+++ b/media-gfx/digikam/digikam-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.1.0-r2.ebuild,v 1.2 2011/10/19 19:11:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuild,v 1.1 2011/11/12 15:52:28 dilfridge Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ MY_P="${PN}-${PV/_/-}"
 
 DESCRIPTION="Digital photo management application for KDE"
 HOMEPAGE="http://www.digikam.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/${P}-tag.patch.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
@@ -72,8 +72,6 @@ S="${WORKDIR}/${MY_P}/core"
 RESTRICT=test
 # bug 366505
 
-PATCHES=( "${DISTDIR}/${P}-tag.patch.bz2" )
-
 src_prepare() {
 	# just to make absolutely sure
 	rm -rf "${WORKDIR}/${MY_P}/extra" || die
diff --git a/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch b/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch
deleted file mode 100644
index 298ce901ada8..000000000000
--- a/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN digikam-2.0.0.orig/core/tests/CMakeLists.txt digikam-2.0.0/core/tests/CMakeLists.txt
---- digikam-2.0.0.orig/core/tests/CMakeLists.txt	2011-07-28 01:28:08.000000000 +0200
-+++ digikam-2.0.0/core/tests/CMakeLists.txt	2011-07-31 21:47:05.000000000 +0200
-@@ -223,9 +223,13 @@
- 
- #------------------------------------------------------------------------
- 
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio
--                    ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf
--                   )
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio)
-+
-+IF(PGF_FOUND)
-+    INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+ELSE(PGF_FOUND)
-+    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf)
-+ENDIF(PGF_FOUND)
- 
- # Disable libpgf warnings.
- SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-@@ -233,11 +237,20 @@
- SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
- KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS})
- TARGET_LINK_LIBRARIES(qtpgftest ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+IF(PGF_FOUND)
-+    TARGET_LINK_LIBRARIES(qtpgftest ${PGF_LIBRARIES})
-+ENDIF(PGF_FOUND)
- 
- SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
- KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS})
- TARGET_LINK_LIBRARIES(pgfscaled ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+IF(PGF_FOUND)
-+    TARGET_LINK_LIBRARIES(pgfscaled ${PGF_LIBRARIES})
-+ENDIF(PGF_FOUND)
- 
- SET(loadpgfdata_SRCS loadpgfdata.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
- KDE4_ADD_EXECUTABLE(loadpgfdata NOGUI ${loadpgfdata_SRCS})
- TARGET_LINK_LIBRARIES(loadpgfdata ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+IF(PGF_FOUND)
-+    TARGET_LINK_LIBRARIES(loadpgfdata ${PGF_LIBRARIES})
-+ENDIF(PGF_FOUND)
diff --git a/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch b/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch
deleted file mode 100644
index a5f05e08d3ce..000000000000
--- a/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 772f592f639f52d0c1a991265098b46672fecb6e
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Fri Aug 26 11:58:59 2011 +0200
-
-    Fix order to link gphoto2 library with digiKam shared lib. This must be the last on linker command line...
-    CCBUGS: 258931
-    CCBUGS: 268267
-
-diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt
-index 42017df..78ca1f1 100644
---- a/digikam/CMakeLists.txt
-+++ b/digikam/CMakeLists.txt
-@@ -279,13 +279,15 @@ TARGET_LINK_LIBRARIES(digikam
- 
-         ${STRIGI_LIBRARIES}
-         ${LCMS_LIBRARIES}
--        ${GPHOTO2_LIBRARIES}
- 
-         digikamcore
-         digikamdatabase
-         advancedrename
-         queuemanager
-         cameragui
-+
-+        # See B.K.O #258931: libgphoto2 library must be the last arg for linker.
-+        ${GPHOTO2_LIBRARIES}
- )
- 
- IF (NOT WIN32 AND GPHOTO2_FOUND)