Restrict fltk dependency to SLOT 1.1 (bug #246445), remove old.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 11 insertions, 48 deletions

diff --git a/x11-misc/stripclub/ChangeLog b/x11-misc/stripclub/ChangeLog
index 22a344fd4465..bcece875b4e5 100644
--- a/x11-misc/stripclub/ChangeLog
+++ b/x11-misc/stripclub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/stripclub
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/ChangeLog,v 1.9 2007/12/26 22:49:42 cla Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/ChangeLog,v 1.10 2008/11/14 19:06:49 coldwind Exp $
+
+  14 Nov 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -stripclub-0.9.1.2.ebuild, stripclub-0.9.1.2-r1.ebuild:
+  Restrict fltk dependency to SLOT 1.1 (bug #246445), remove old.
 
   26 Dec 2007; Dawid Węgliński <cla@gentoo.org>
   stripclub-0.9.1.2-r1.ebuild:
diff --git a/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild b/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild
index 0d0a005bdcd4..88d8bce28665 100644
--- a/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild
+++ b/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild,v 1.2 2007/12/26 22:49:42 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild,v 1.3 2008/11/14 19:06:49 coldwind Exp $
+
+EAPI=1
 
 inherit eutils
 
@@ -15,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc x86"
 IUSE=""
 
-DEPEND=">=x11-libs/fltk-1.1.4
+DEPEND=">=x11-libs/fltk-1.1.4:1.1
 		>=dev-libs/libpcre-5.0
 		>=media-libs/libpng-1.2.8
 		>=media-libs/jpeg-6b-r4
diff --git a/x11-misc/stripclub/stripclub-0.9.1.2.ebuild b/x11-misc/stripclub/stripclub-0.9.1.2.ebuild
deleted file mode 100644
index 64038315af23..000000000000
--- a/x11-misc/stripclub/stripclub-0.9.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/stripclub-0.9.1.2.ebuild,v 1.7 2007/08/23 17:56:30 jer Exp $
-
-inherit eutils
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="A webcomic reader."
-HOMEPAGE="http://stripclub.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stripclub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc x86"
-IUSE=""
-
-DEPEND=">=x11-libs/fltk-1.1.4
-		>=dev-libs/libpcre-5.0
-		>=media-libs/libpng-1.2.8
-		>=media-libs/jpeg-6b-r4
-		x11-libs/libXpm"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-Makefile.linux.patch
-}
-
-src_compile() {
-	./configure --skip-tests
-	emake PREFIX=/usr || die "emake failed"
-}
-
-src_install() {
-	make \
-		PREFIX=${D}/usr \
-		BINDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man \
-		DOCDIR=${D}/usr/share/doc/${P} \
-		install || die
-}