Clean up. Remove deprecated slot_rebuild() check.

(Portage version: 2.1.4.4)

4 files changed, 8 insertions, 77 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 07db220842eb..4e99b47e20e0 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.28 2008/03/26 20:01:48 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.29 2008/05/17 15:59:12 carlo Exp $
+
+  17 May 2008; Carsten Lohrke <carlo@gentoo.org> kphotoalbum-3.1.0.ebuild,
+  -kphotoalbum-3.1.1.ebuild, kphotoalbum-3.1.1-r1.ebuild:
+  Clean up. Remove deprecated slot_rebuild() check.
 
 *kphotoalbum-3.1.1-r1 (26 Mar 2008)
 
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
index b675fdc61498..879176c8497b 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild,v 1.6 2008/02/19 01:45:58 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.0.ebuild,v 1.7 2008/05/17 15:59:12 carlo Exp $
 
 inherit kde
 
@@ -34,7 +34,6 @@ need-kde 3.5
 PATCHES="${FILESDIR}/${P}-exiv2.patch"
 
 pkg_setup() {
-	setupok=1
 	if use exif ; then
 		if ! built_with_use =x11-libs/qt-3* sqlite ; then
 			elog "To enable KPhotoAlbum to search your images"
@@ -42,16 +41,9 @@ pkg_setup() {
 			elog "Qt installed with SQLite support."
 			elog
 			elog "Make sure your Qt is installed with the sqlite USE flag."
-			setupok=0
+			die
 		fi
 	fi
-
-	slot_rebuild "media-libs/libkipi"
-	setupok=$?
-
-	if [[ $setupok == 0 ]] ; then
-		die
-	fi
 }
 
 src_unpack() {
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild
index f4151733cbda..5eb3a6940802 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild,v 1.1 2008/03/26 20:01:48 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild,v 1.2 2008/05/17 15:59:12 carlo Exp $
 
 USE_KEG_PACKAGING=1
 LANGS="ar be br ca cs cy da de el en_GB es et fi fr ga gl hi is it ja ka lt ms
@@ -29,19 +29,12 @@ need-kde 3.5
 PATCHES="${FILESDIR}/${P}-gcc-4.3.patch"
 
 pkg_setup() {
-	setupok=0
 	if use exif && ! built_with_use =x11-libs/qt-3* sqlite ; then
 		eerror "To enable KPhotoAlbum to search your images"
 		eerror "using EXIF information you also need to have"
 		eerror "Qt installed with SQLite support."
 		eerror
 		eerror "Make sure your Qt is installed with the sqlite USE flag."
-		((setupok++))
-	fi
-
-	slot_rebuild "media-libs/libkipi" && ((setupok++))
-
-	if (($setupok > 0)); then
 		die
 	fi
 }
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.1.ebuild
deleted file mode 100644
index 70baf7444d0f..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-3.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.1.ebuild,v 1.1 2008/03/18 18:09:04 zlin Exp $
-
-USE_KEG_PACKAGING=1
-LANGS="ar be br ca cs cy da de el en_GB es et fi fr ga gl hi is it ja ka lt ms
-mt nb nds nl pa pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tr uk vi zh_CN"
-KEG_PO_DIR=translations
-inherit kde
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="http://www.kphotoalbum.org/download/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="${IUSE} arts exif raw"
-
-DEPEND="arts? ( =kde-base/arts-3.5* )
-	exif? ( >=media-gfx/exiv2-0.15 )
-	raw? ( >=media-libs/libkdcraw-0.1.1 )
-	>=media-libs/jpeg-6b-r7
-	>=media-libs/libkipi-0.1
-	|| ( =kde-base/kdegraphics-kfile-plugins-3.5* =kde-base/kdegraphics-3.5* )"
-
-need-kde 3.5
-
-pkg_setup() {
-	setupok=0
-	if use exif && ! built_with_use =x11-libs/qt-3* sqlite ; then
-		elog "To enable KPhotoAlbum to search your images"
-		elog "using EXIF information you also need to have"
-		elog "Qt installed with SQLite support."
-		elog
-		elog "Make sure your Qt is installed with the sqlite USE flag."
-		((setupok++))
-	fi
-
-	slot_rebuild "media-libs/libkipi" && ((setupok++))
-
-	if (($setupok > 0)); then
-		die
-	fi
-}
-
-src_compile() {
-	sed -i -e '/^MimeType/ s/$/;/' "${S}"/src/kphotoalbum-import.desktop || \
-		die "sed to fix desktop entry failed."
-
-	local myconf="$(use_enable raw kdcraw) $(use_enable exif exiv2)"
-	if ! use exif; then
-		elog "NOTICE: You have the exif USE flag disabled. ${CATEGORY}/${PN}"
-		elog "will be compiled without EXIF support."
-	fi
-
-	kde_src_compile
-}