Cleanup

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

4 files changed, 26 insertions, 254 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index b0ab2475d634..75a47112370c 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # 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.173 2011/01/31 08:39:45 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.174 2011/02/02 22:11:52 dilfridge Exp $
+
+  02 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -digikam-1.2.0-r3.ebuild, -digikam-1.7.0.ebuild:
+  Cleanup
 
   31 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   digikam-1.2.0-r4.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 18d790e662cd..13354362c20a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
 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
@@ -6,12 +9,26 @@ AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c332
 AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
-DIST digikam-1.7.0.tar.bz2 23386697 RMD160 6b13c1788e7fe97b8043d7d3237808815da6a8f4 SHA1 5e061570ab2cc8081d8207de4791950ffe73b49c SHA256 16efee432c4d8e115298abe9dcde6e68dcc93fe0c1fd4f39211e6f19e5a80389
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.2.0-r3.ebuild 3219 RMD160 6a5187b3e6a0866ecc0c1e95c77f737b84478969 SHA1 fa8f9eea4a6894f1ecd0494f19fbf2d21c07e844 SHA256 776fc41a003c8e0cbe61d123067b3d5cf9bf5d3cc0b57eb088d8fcc9d21db17c
 EBUILD digikam-1.2.0-r4.ebuild 3214 RMD160 a9c5d489d0a461d5e60939dc586137af4199e1c1 SHA1 439586e88f4164feb51a0724d9bcd3286bcbd363 SHA256 ebc5f8f36e91d66b3d5300cee9fcf9073725cd4580991f986e9de2a5f82c5827
-EBUILD digikam-1.7.0.ebuild 3148 RMD160 3c5f1e555f90c9426acc13cae2de7b2a85a8b6cd SHA1 a43ac64cdef4edb5fb24acb0fdaf9662965ccdfe SHA256 174b13da7a4b8cf16992e82c45a60820a2c749577933fce030b62a18627ec369
 EBUILD digikam-1.8.0.ebuild 3233 RMD160 c49460e169ca6a4ca4e0bc2d7cc375d9bf230d64 SHA1 5a7e9101f55305e9d75ed9555c2a428b2c75bdc2 SHA256 318ccfbca4b7648cd3d135e5d52d24f67920847026a90b095e7ff05763573e39
-MISC ChangeLog 28995 RMD160 dd41d47916403aa8c51516cdcb6b9e3be25d9003 SHA1 03cfe3d70a1b8c9b4d4c8a93bd78679c57dd860a SHA256 bffb62449b5e63d377bd417248ebe41f3c0ca99da9b3223b88754dd40e1210a4
+MISC ChangeLog 29113 RMD160 4ca4efe0a5bde363b24031a2d2ec17f67c9c31d6 SHA1 40ab5cfad6906334609fdb772b68bd2404a601e0 SHA256 2536fabb1c96172d748dd3206f1db100bef0827f944a10c7810bfb44a15c2fa0
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNSdaGAAoJENwGBM22xfferEIP/2OeZOBcPtNbAjpebMvnnxwl
+EgvA+2dGCD/FTbNoTmO1XiWj3jqxT01HfTeoc9yaxh8ARLYcZZCwwejhK4HNXz3m
+caXa45P26qkV+HfYePOda2G3oaH+LHXvgqSfURs0Bzb9xh3KglTo9DpRnOaV1tmC
+5rnDoLZqvHLvmlQMPLbdvvexQomf53v45OClIMUgSrnLNR2mEfrqdL5Mp/CRCOd+
+yG+rJrxqdbRaAxMuxIVAV2RrgtE6uJeFb1hVq/T4/b4xl9YsJ3hgxwobXDf5wSEU
+ib4+NmgbfA0Cg4jaC+G20t0PRVozLFnK8/0dYJVHIglT2V8maPp+/czK1dEGrjXt
+WttYdIUqehkHmdcixdcrIAIi2vr7yqZqE7YTMQk+D0XKYGLHHeg6cK9iFbLrTGN3
+ebExL6NsfROiEwx9Ce079p4p7B+9l4v82sjUxexaH5cAyHPFhg/ceHxskWgpYDGn
+3mPqtn6/HdMKQANL7bGnwYCIBwJ/J72FeciOxgkjmPf/ixXPFnDLzqi7UgbD2fa2
++tSpvSLuQeDdFVLnYOfWpGgdy65PBNHc9r1YkfZCCN9G0sUmyrGut0hvFx88Nl6d
+mW2gBxgnR0TFNcWxEyi8zfgnpgaJ6Do8aAGsJAN+P2JusyjQ0zSuy7vKRPJoEXAg
+Amhre8v7dVbqFRGiLtdL
+=nvxG
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.2.0-r3.ebuild b/media-gfx/digikam/digikam-1.2.0-r3.ebuild
deleted file mode 100644
index e4b845f2297a..000000000000
--- a/media-gfx/digikam/digikam-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r3.ebuild,v 1.4 2010/11/03 21:42:36 maekke Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km
-ko lt lv lb 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"
-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 x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 handbook lensfun semantic-desktop +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
-	>=media-libs/jpeg-8
-	media-libs/lcms:0
-	media-libs/liblqr
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	virtual/lapack
-	x11-libs/qt-gui[qt3support]
-	x11-libs/qt-sql[sqlite]
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
-	gphoto2? ( media-libs/libgphoto2 )
-	lensfun? ( media-libs/lensfun )
-"
-RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
-	video? (
-		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
-		)
-	)
-"
-# gcc[fortran] is required since we cannot otherwise link to the lapack library
-#   (the fun of unbundling)
-DEPEND="${CDEPEND}
-	sys-devel/gcc[fortran]
-	sys-devel/gettext
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}"-{ratingwidget,libpgf-r3,docs-r3,lapack}.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=(
-		-DWITH_LQR=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 lensfun LensFun)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		-DENABLE_THEMEDESIGNER=OFF
-		$(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/digikam-1.7.0.ebuild b/media-gfx/digikam/digikam-1.7.0.ebuild
deleted file mode 100644
index 7298223010e1..000000000000
--- a/media-gfx/digikam/digikam-1.7.0.ebuild
+++ /dev/null
@@ -1,124 +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.7.0.ebuild,v 1.2 2011/01/19 12:59:18 scarabeus Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr 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 ~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}/${P}"-docs.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
-}