Version bump. Removing betas. Patching the configure script to fix bug 231921 and to pass our currently set CXXFLAGS and LDFLAGS.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-hg1 i686

5 files changed, 51 insertions, 44 deletions

diff --git a/app-editors/juffed/ChangeLog b/app-editors/juffed/ChangeLog
index 0cd37d8122f0..328818c12891 100644
--- a/app-editors/juffed/ChangeLog
+++ b/app-editors/juffed/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2008/07/27 02:09:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/ChangeLog,v 1.4 2008/08/05 04:53:49 yngwin Exp $
+
+*juffed-0.3 (05 Aug 2008)
+
+  05 Aug 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/juffed-0.3-configure.patch, -juffed-0.3_beta20080421.ebuild,
+  -juffed-0.3_beta20080705.ebuild, +juffed-0.3.ebuild:
+  Version bump. Removing betas. Patching the configure script to fix bug
+  231921 and to pass our currently set CXXFLAGS and LDFLAGS.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org>
   juffed-0.3_beta20080421.ebuild, juffed-0.3_beta20080705.ebuild:
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 75e1b7cad3de..0bd2d1d135f1 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,6 +1,5 @@
-DIST juffed_0.3-beta2.tar.gz 107097 RMD160 dd65b128b55ec8395227f29607985326c3a195b2 SHA1 6dbde92a4ac55f1e53ba9e5b3f20e5ea1aa76f76 SHA256 f9984245de3d033b60b176423ade4baf7fd58e821b18f2f982e80ad2bf595b4b
-DIST juffed_0.3-dev-20080421.tar.gz 100770 RMD160 058cb7b84de962999d8cbf49012cbddae28bd142 SHA1 9ffe1cc16f6e0cbd4336bbb469be66b780e4abd5 SHA256 0a9700f93c371f9b934f8e7e801796d7f4b27405867aa25498c2b503fda91085
-EBUILD juffed-0.3_beta20080421.ebuild 993 RMD160 a8a81e2bf9e366ef11538678b152e3998f839286 SHA1 f946a2b6bfa62d146bdf8cb61d5af2f4d7eae55e SHA256 825986c3fdebe06957cd72ca6df510ff0dba2f27440c7b9d362558701567417f
-EBUILD juffed-0.3_beta20080705.ebuild 971 RMD160 f744d7501f1961bf370aa6b63148a4366542693a SHA1 cce57ae6f9e6e2fc1cb747c13552d2d9042da060 SHA256 b2cb7afb5b2aa7e9ae7abcadf77f310c32ead998268b0c4fc3848c3343a53749
-MISC ChangeLog 889 RMD160 05099e50506c072d1a6e309b51c50d410ca4bd4e SHA1 3133083d05466daacbac6cbeac714043c1d7df5f SHA256 b1692ed73dab5f9514b9e7dc8473bbbbba30aedbf6bca0fedc73563b23cec054
+AUX juffed-0.3-configure.patch 902 RMD160 c73be0937d846ccf2b29b165a1e259aaaeb2f239 SHA1 144569afef85b734f899b0815cef9cbbd6435378 SHA256 67c76df6591312ec963ea63dcaab6d980a55c2d09b390667fe1c1508dda7ace1
+DIST juffed_0.3.tar.gz 107265 RMD160 d1f683139dacb77562633ff49ad74bc492bf36e1 SHA1 48d79d84f0fc4488109299384d04b4bca2ba7dc1 SHA256 ed7bb4703ce4cd14819f3acb8b3fae59f61090964b615f8324a44981730fc326
+EBUILD juffed-0.3.ebuild 1109 RMD160 5c792958761f6748671e58341a309611348856d1 SHA1 d36fe5413f6c71536f0ceafab42deb03620bc073 SHA256 1df023a40248d3824956b362d7e1d661215f8780dcf359463662eadcae6c91da
+MISC ChangeLog 1225 RMD160 89adecee8b6f4d32443361873b23e97801a56ae5 SHA1 cacaaa29907705899eb6ad80e45e5895cbd7a0bd SHA256 c60f08a282fe5c131cc2b6702f19f6f3e7d6cc3e95549853e16a4138ee69d0a8
 MISC metadata.xml 255 RMD160 e3e91ebc01de2437993e02feffb8acb60795a3aa SHA1 aeabb415f098f2396fc363625e54a0078aeb1eff SHA256 dda5e93ee2137815bce4c850c9b8e56862b8ef06cb7eefd806fbd799491123be
diff --git a/app-editors/juffed/files/juffed-0.3-configure.patch b/app-editors/juffed/files/juffed-0.3-configure.patch
new file mode 100644
index 000000000000..bb4f8bf24997
--- /dev/null
+++ b/app-editors/juffed/files/juffed-0.3-configure.patch
@@ -0,0 +1,29 @@
+--- juffed_0.3_orig/configure	2008-07-17 02:04:22.000000000 +0200
++++ juffed_0.3/configure	2008-08-05 06:39:30.000000000 +0200
+@@ -184,7 +184,7 @@
+ ${qmake_cmd} -project -o test.pro
+ echo "" >> test.pro
+ echo "QT  += xml" >> test.pro
+-${qmake_cmd} 2>configure.log
++${qmake_cmd} "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w" 2>configure.log
+ ${make_cmd} 1>/dev/null 2>>configure.log
+
+ test_prg=`cat configure.log`
+@@ -230,7 +230,7 @@
+ 	echo "LIBS += -L${arg_qsci_lib_path}" >> test.pro
+ fi
+
+-${qmake_cmd} 2>configure.log
++${qmake_cmd} "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w" 2>configure.log
+ ${make_cmd} 1>/dev/null 2>>configure.log
+
+ test_prg=`cat configure.log`
+@@ -293,7 +293,7 @@
+ LRELEASE='${lrelease_cmd}'
+
+ src/juffed:
+-	cd src && $(QMAKE) && $(MAKE)
++	cd src && $(QMAKE) "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}" "QMAKE_LFLAGS_RELEASE=${LDFLAGS}" && $(MAKE)
+ 	cd src && $(LRELEASE) juffed.pro
+
+ distclean:
diff --git a/app-editors/juffed/juffed-0.3_beta20080705.ebuild b/app-editors/juffed/juffed-0.3.ebuild
index f561a8af6749..89525969bcc3 100644
--- a/app-editors/juffed/juffed-0.3_beta20080705.ebuild
+++ b/app-editors/juffed/juffed-0.3.ebuild
@@ -1,11 +1,11 @@
 # 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_beta20080705.ebuild,v 1.3 2008/07/27 02:09:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.3.ebuild,v 1.1 2008/08/05 04:53:49 yngwin Exp $
 
 EAPI=1
 inherit qt4
 
-MY_P=${PN}_${PV/_beta20080705/-beta2}
+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"
@@ -22,6 +22,13 @@ 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
diff --git a/app-editors/juffed/juffed-0.3_beta20080421.ebuild b/app-editors/juffed/juffed-0.3_beta20080421.ebuild
deleted file mode 100644
index bb4cf09137f4..000000000000
--- a/app-editors/juffed/juffed-0.3_beta20080421.ebuild
+++ /dev/null
@@ -1,36 +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_beta20080421.ebuild,v 1.3 2008/07/27 02:09:27 carlo Exp $
-
-EAPI=1
-inherit qt4
-
-MY_P=${PN}_${PV/_beta/-dev-}
-
-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 ~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_compile() {
-	# with econf it chokes on Unrecognized option: --host=...
-	./configure --qmake=qmake \
-		--prefix=/usr --qt_lib_path=/usr/lib/qt4
-	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}
-}