Cleanup

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

6 files changed, 20 insertions, 258 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index c8ddc2f398ab..0ad8a7859395 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # 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.179 2011/03/01 07:19:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.180 2011/03/06 20:53:02 dilfridge Exp $
+
+  06 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/digikam-1.6.0-docs.patch, -files/digikam-1.7.0-docs.patch,
+  -digikam-1.8.0.ebuild, -files/digikam-1.8.0-gcc46.patch:
+  Cleanup
 
   01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-1.9.0.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e335dee2cca0..cb9e9dff0efb 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -5,34 +5,29 @@ AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294
 AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
 AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74c69923 SHA1 857589931a4c2acefcc822b664dd02ce324ea152 SHA256 0424234746611e2b75b74725e53705277308fc3596ac095013de985cc6a01622
 AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
-AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
-AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
-AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
-DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
-EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
 EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
-MISC ChangeLog 29921 RMD160 1b38b716a3734a7456e85c2b8ebdd0aa08af26e1 SHA1 f23be08bf9fa821de1e70de38285267e85b01905 SHA256 95d37ed13e81dd9e12c8f518def45b6bf32ef512a9ac89ee2652a0ba9b48dcf3
+MISC ChangeLog 30116 RMD160 a2db03a4ad524a8d726dd42e9b6f0d6308ccd7af SHA1 05c9853fc50549ddc83f1fd6f89b77d1eb0624a6 SHA256 99dc25aab9ad5aa6162241eee8cd7682a6d35561491e266f30e871b0e03d0752
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNbJ5qAAoJENwGBM22xffekUgQAJ3qK5MboTo+/XBfJpfTC5RE
-bE3r3xHnuIqMP9CQo0Ckoj8kwwTL75IYH0Jto/hUe1t3W09GGf/vx6OW08wEU1W4
-asxecMr6ymQF4w6EByGYV1rtYY19oOGKqff3NBG5Ph16Lx7KZd6nRAsp6asyqYTa
-XwMY+i9jgdbpjUrFOX9iaArhJkZ8/DDo03wOKkf67RrCkD7miXhrh4uhRdtNosJ4
-oyH2Zqnxecdk/FpCjPO+YhskuxXX1Ajq7iujtUkwEQkaH1Yo39MNMaRui82eey9G
-yRSd+soLbjgWC+joU8Fa/2Zsbf0Q5BwlcZip2zT5i3Yiktr4a+CKXrT9LQ9hwF1D
-V51PSKe86pVU20LZLusg+4H5l8BasUCHbEC22kFY33Pmalg2A4TjnwgyyB1ogz/4
-qu+rU+sbc6B9VA/IUApXKDs7bQWQwRiWOr3mqIWjplGz/6NNj5Kgu0B47xvU513j
-lfmr6jCPen+zA2VbLluSMcfAWAcXXN2bPkWe+06RnO6x1/3OIMuu05q/vivb6bGU
-TBdMXKWi4hXol59HohX1pSpArBzw3RX+wpDS6pyY6KWLnWvGBYNQpJbHPyVaxdgS
-sK0iBrUjeCE3CfIJ/BBrgrUf41spQzP6MRw2QKX1BienrsxUHtygnXR4sP9FY095
-c3eNGSad3qY0jwk4L9/T
-=+o1y
+iQIcBAEBAgAGBQJNc/SPAAoJENwGBM22xffe8T8P+wUK3BoUnqUcTqzU9MFkmyt6
+xE9DItlG7qm4JpO+0UMDAU9q2mgcH+UDcf/Amp36LmwSbZyTuTgHlH9A4xnVyIAW
+XbygL9dGJYO0lor8O1A1XQauXHwv20drpfpvf+K6mLjKzsahjP7DO66tWiBpTYiR
+evVjTSzer3UUq5sLlED4w+XQTYIWF6pnPd1OwrjdOSZqZsSAaWrAxf35HsGZdGdX
+QqqlTYORgRmRsLzfX2nLbUHes+rhe5cOJs2RMmMaMpbUXA03GKn5A30x1BtFHXY1
+e4xyvMtrPh+plgFfyDjsxuPEOTxm5q6GMopSgnd63+GGshhYBuU+lAThEDqMLCfB
+q1IQ7xFyEfNt1zoHvfpDjZirlBFTM88IIHa0YYOq6LBZLYX5QdId7+dd1ACJlRZB
+MFdwpeX16FdKfpvhv0+osEdjSCHAO15iuNdDOu4dQk6FfXQIKVORR5tBL9b+QUGd
+/IirIW026GaRcZTF78xr5ZaeiWuMWlwb59xPrOXuyzUIkn+AHMNorZmR+HHOmLIa
+8YZbyckyb1nyeG9pnIF9wKQvBxuUeIaWyrDezlggZWA5rtLEgq6VRvXpUd9eCCXc
+d3bxcRU8S0j/ZOEFAFAc/KADonoMIi5AxOlNDOLdCQ82szbg3McIOk+7WqK/rltX
+2pvkMfDadtd+BI+c8HvF
+=Qw1/
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild
deleted file mode 100644
index 0f4eca1805e9..000000000000
--- a/media-gfx/digikam/digikam-1.8.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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-1.8.0.ebuild,v 1.4 2011/02/11 20:33:40 xarthisius Exp $
-
-EAPI=3
-
-KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
-ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
-KMNAME="extragear/graphics"
-
-# needed for sufficiently new libkdcraw
-KDE_MINIMAL="4.5"
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
-	media-libs/jasper
-	virtual/jpeg
-	media-libs/lcms:0
-	>=media-libs/lensfun-0.2.5
-	media-libs/liblqr
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	>=sci-libs/clapack-3.2.1-r3
-	virtual/mysql
-	x11-libs/qt-gui[qt3support]
-	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
-	gphoto2? ( media-libs/libgphoto2 )
-"
-RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
-	video? (
-		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch
-	"${FILESDIR}/${P}"-{tests,gcc46}.patch )
-
-src_prepare() {
-	if use handbook; then
-		mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
-	else
-		mkdir doc || die
-		echo > doc/CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_with geolocation MarbleWidget)
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		dodir /usr/share/doc/${PF}/html || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
-	fi
-
-	if use handbook; then
-		dodoc readme-handbook.txt || die
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
-	fi
-}
diff --git a/media-gfx/digikam/files/digikam-1.6.0-docs.patch b/media-gfx/digikam/files/digikam-1.6.0-docs.patch
deleted file mode 100644
index 66376b027512..000000000000
--- a/media-gfx/digikam/files/digikam-1.6.0-docs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ru digikam-1.6.0.orig/CMakeLists.txt digikam-1.6.0/CMakeLists.txt
---- digikam-1.6.0.orig/CMakeLists.txt	2010-11-22 18:50:48.000000000 +0100
-+++ digikam-1.6.0/CMakeLists.txt	2010-11-25 00:16:54.000000000 +0100
-@@ -1423,7 +1423,14 @@
- # ==================================================================================================
- # API documentation generation
- 
--IF(DOXYGEN_FOUND)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+
-+  IF(DOXYGEN_FOUND)
-+
-+    MESSAGE(STATUS "")
-+    MESSAGE(STATUS "API documentation will be installed")
-+    MESSAGE(STATUS "")
- 
-     SET(API_DIR ${CMAKE_BINARY_DIR}/api)
-     SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-@@ -1432,8 +1439,27 @@
- 
-     CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
- 
--    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-+    ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
--ENDIF(DOXYGEN_FOUND)
-+
-+  ELSE(DOXYGEN_FOUND)
-+
-+    MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
-+
-+  ENDIF(DOXYGEN_FOUND)
-+
-+ELSE(BUILD_DOC)
-+
-+  MESSAGE(STATUS "")
-+  MESSAGE(STATUS "Documentation will NOT be installed")
-+  MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+  MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
-+
-+
- include(MacroOptionalAddSubdirectory)
- macro_optional_add_subdirectory( po )
-+
-+# Build the handbook
-+add_subdirectory( doc )
diff --git a/media-gfx/digikam/files/digikam-1.7.0-docs.patch b/media-gfx/digikam/files/digikam-1.7.0-docs.patch
deleted file mode 100644
index 4d4edeaa7de2..000000000000
--- a/media-gfx/digikam/files/digikam-1.7.0-docs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN digikam-1.7.0.orig/CMakeLists.txt digikam-1.7.0/CMakeLists.txt
---- digikam-1.7.0.orig/CMakeLists.txt	2010-12-19 11:31:26.000000000 +0100
-+++ digikam-1.7.0/CMakeLists.txt	2010-12-26 18:57:13.000000000 +0100
-@@ -1423,8 +1423,15 @@
- # ==================================================================================================
- # API documentation generation
- 
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+
- IF(DOXYGEN_FOUND)
- 
-+    MESSAGE(STATUS "")
-+    MESSAGE(STATUS "API documentation will be installed")
-+    MESSAGE(STATUS "")
-+
-     SET(API_DIR ${CMAKE_BINARY_DIR}/api)
-     SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-     SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
-@@ -1432,9 +1439,28 @@
- 
-     CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
- 
--    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-+    ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+
-+ELSE(DOXYGEN_FOUND)
-+
-+    MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
-+
- ENDIF(DOXYGEN_FOUND)
-+
-+ELSE(BUILD_DOC)
-+
-+    MESSAGE(STATUS "")
-+    MESSAGE(STATUS "Documentation will NOT be installed")
-+    MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+    MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
-+
- find_package(Msgfmt REQUIRED)
- find_package(Gettext REQUIRED)
- add_subdirectory( po )
-+
-+# Build the handbook
-+add_subdirectory( doc )
-+
diff --git a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
deleted file mode 100644
index d9581021281d..000000000000
--- a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp	2011/02/06 10:48:24	1219102
-+++ trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp	2011/02/06 11:02:50	1219103
-@@ -257,6 +257,12 @@
-             kDebug() << "Transition to Running: Invalid Inactive state" << q;
-             return false;
-         }
-+        default:
-+        {
-+            kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q;
-+            return false;
-+        }
-+
-     }
- }
-