EAPI 1->2, adding qt4 use dep on qscintilla. Fixes bug 250642.

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-hh6 i686)

3 files changed, 11 insertions, 51 deletions

diff --git a/app-editors/juffed/ChangeLog b/app-editors/juffed/ChangeLog
index f3deb4c95e7d..dc30f9f6e8f6 100644
--- a/app-editors/juffed/ChangeLog
+++ b/app-editors/juffed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/juffed
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/ChangeLog,v 1.6 2008/11/06 15:46:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/ChangeLog,v 1.7 2008/12/11 21:16:23 yngwin Exp $
+
+  11 Dec 2008; Ben de Groot <yngwin@gentoo.org> -juffed-0.3.ebuild,
+  juffed-0.4.ebuild:
+  Drop old. EAPI 1->2, adding qt4 use dep on qscintilla. Fixes bug 250642.
 
 *juffed-0.4 (06 Nov 2008)
 
@@ -26,8 +30,8 @@
 
   07 Jul 2008; Ben de Groot <yngwin@gentoo.org>
   +juffed-0.3_beta20080705.ebuild:
-  Version bump. This beta2 renamed to date, to prevent it looking like 
-  a downgrade from the previous versioning cockup. Next time I will do 
+  Version bump. This beta2 renamed to date, to prevent it looking like
+  a downgrade from the previous versioning cockup. Next time I will do
   better - promise!
 
 *juffed-0.3_beta20080421 (04 Jun 2008)
diff --git a/app-editors/juffed/juffed-0.3.ebuild b/app-editors/juffed/juffed-0.3.ebuild
deleted file mode 100644
index ca95f722090e..000000000000
--- a/app-editors/juffed/juffed-0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.3.ebuild,v 1.2 2008/10/25 22:07:03 pvdabeel Exp $
-
-EAPI=1
-inherit qt4
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
-HOMEPAGE="http://www.qt-apps.org/content/show.php/JuffEd?content=59940"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/qscintilla-2.1
-	|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# force our current cxxflags and ldflags, and turn off warnings in tests, bug 231921
-	epatch "${FILESDIR}"/${P}-configure.patch
-}
-
-src_compile() {
-	# with econf it chokes on Unrecognized option: --host=...
-	./configure --qmake=qmake --prefix=/usr
-	emake || die "Make failed!"
-}
-
-src_install() {
-	emake FAKE_ROOT="${D}" install || die "Make install failed!"
-	dodoc ChangeLog README
-	rm "${D}"/usr/share/juffed/{COPYING,README}
-}
diff --git a/app-editors/juffed/juffed-0.4.ebuild b/app-editors/juffed/juffed-0.4.ebuild
index a21a51fc552e..77faf695d87c 100644
--- a/app-editors/juffed/juffed-0.4.ebuild
+++ b/app-editors/juffed/juffed-0.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.4.ebuild,v 1.1 2008/11/06 15:46:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.4.ebuild,v 1.2 2008/12/11 21:16:23 yngwin Exp $
 
-EAPI=1
+EAPI=2
 inherit qt4
 
 MY_P=${PN}_${PV}
@@ -16,15 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/qscintilla-2.1
+RDEPEND=">=x11-libs/qscintilla-2.1[qt4]
 	|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# force our current cxxflags and ldflags, and turn off warnings in tests, bug 231921
 	epatch "${FILESDIR}"/${PN}-0.3-configure.patch
 }