Add slot to gtk+ dependency.

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

3 files changed, 7 insertions, 70 deletions

diff --git a/app-misc/booh/ChangeLog b/app-misc/booh/ChangeLog
index 1548aef53479..d14ebb4a7678 100644
--- a/app-misc/booh/ChangeLog
+++ b/app-misc/booh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/booh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.29 2011/03/01 18:40:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.30 2011/03/01 18:40:59 graaff Exp $
+
+  01 Mar 2011; Hans de Graaff <graaff@gentoo.org> booh-0.9.3.ebuild:
+  Add slot to gtk+ dependency.
 
   01 Mar 2011; Hans de Graaff <graaff@gentoo.org> -booh-0.9.2.2.ebuild:
   Add slot to gtk+ dependency.
diff --git a/app-misc/booh/booh-0.9.2.2.ebuild b/app-misc/booh/booh-0.9.2.2.ebuild
deleted file mode 100644
index 0784c739ace0..000000000000
--- a/app-misc/booh/booh-0.9.2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/booh-0.9.2.2.ebuild,v 1.4 2010/06/01 19:24:11 graaff Exp $
-
-EAPI="2"
-
-inherit eutils bash-completion
-
-DESCRIPTION="Static HTML photo album generator"
-HOMEPAGE="http://booh.org/index.html"
-SRC_URI="http://booh.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk encode exif"
-
-DEPEND="dev-lang/ruby
-	>=dev-ruby/ruby-gettext-0.8.0
-	media-gfx/exiv2
-	dev-ruby/ruby-glib2
-	gtk? (	>=dev-ruby/ruby-gtk2-0.12
-		>=x11-libs/gtk+-2.8 )"
-
-RDEPEND="${DEPEND}
-	dev-ruby/rubygems
-	|| ( media-gfx/imagemagick[jpeg,png] media-gfx/graphicsmagick[jpeg,png] )
-	exif? ( media-gfx/exif )
-	encode? ( media-video/mplayer )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.1-require_gems.patch
-	epatch "${FILESDIR}"/${P}-stdc.patch
-
-	# Remove scripts requiring gtk if gtk is not used
-	if ! use gtk; then
-		rm bin/booh bin/booh-classifier bin/booh-fix-whitebalance \
-		bin/booh-gamma-correction
-	fi
-}
-
-src_configure() {
-	ruby setup.rb config || die "ruby setup.rb config failed"
-	ruby setup.rb setup || die "ruby setup.rb setup failed"
-	cd ext
-	ruby extconf.rb || die "ruby extconf.rb failed"
-	sed -i -e 's:-Wl,--no-undefined ::' Makefile || die "--no-undefined removal failed"
-	sed -i -e 's:-Wl,-R$(libdir)::' -e 's:-Wl,-R -Wl,$(libdir)::' Makefile || die "Fix insecure RUNPATH failed"
-}
-
-src_install() {
-	ruby setup.rb install \
-		--prefix="${D}" || die "ruby setup.rb install failed"
-	cd ext
-	emake install \
-		DESTDIR=${D} \
-		libdir=${D}/`ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']"` \
-		archdir=${D}/`ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']"` \
-		|| die "emake install failed"
-	cd ..
-	domenu desktop/booh-classifier.desktop desktop/booh.desktop || die "domenu failed"
-	doicon desktop/booh-48x48.png || die "doicon failed"
-	dobashcompletion booh.bash-completion || die "dobashcompletion failed"
-	dodoc AUTHORS ChangeLog INTERNALS README VERSION THEMES \
-		|| die "dodoc failed"
-}
diff --git a/app-misc/booh/booh-0.9.3.ebuild b/app-misc/booh/booh-0.9.3.ebuild
index 1bcab15537a1..82f6709baf46 100644
--- a/app-misc/booh/booh-0.9.3.ebuild
+++ b/app-misc/booh/booh-0.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/booh-0.9.3.ebuild,v 1.1 2010/07/13 06:33:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/booh-0.9.3.ebuild,v 1.2 2011/03/01 18:40:59 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk encode exif"
 
 CDEPEND="media-gfx/exiv2
-	gtk? ( >=x11-libs/gtk+-2.8 )"
+	gtk? ( >=x11-libs/gtk+-2.8:2 )"
 
 DEPEND="${DEPEND} ${CDEPEND}"
 RDEPEND="${RDEPEND} ${CDEPEND}