bumped to nvu-1.0PR

(Portage version: 2.0.51.19)

8 files changed, 31 insertions, 91 deletions

diff --git a/app-editors/nvu/ChangeLog b/app-editors/nvu/ChangeLog
index fac1241c5f60..75213beb08e7 100644
--- a/app-editors/nvu/ChangeLog
+++ b/app-editors/nvu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/nvu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.2 2005/03/23 16:45:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.3 2005/04/14 22:57:03 anarchy Exp $
+
+*nvu-1.0_pre (14 Apr 2005)
+
+  14 Apr 2005; <anarchy@gentoo.org> 
+  +files/mozconfig-1.0PR, +nvu-1.0_pre.ebuild
+  -files/mozconfig, -nvu-0.50.ebuild, -nvu-0.60.ebuild :
+  Bumped to version 1.0PR
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   +files/nvu-0.50-dir.patch, +files/nvu-0.50-freetype-compile.patch,
diff --git a/app-editors/nvu/Manifest b/app-editors/nvu/Manifest
index 1ea88a642c9b..52942c073981 100644
--- a/app-editors/nvu/Manifest
+++ b/app-editors/nvu/Manifest
@@ -1,16 +1,19 @@
+MD5 175a86273aba0fa96562131a3e96507f ChangeLog 2789
 MD5 09bf80a18f3b608defbdde2b56642e02 metadata.xml 376
 MD5 4f012096290537d92ef2c7cf891859e2 nvu-0.50.ebuild 1366
 MD5 e30a6d4193e8bb1cf5551b75bf0f8ccd nvu-0.60.ebuild 2171
 MD5 e3b4ccc9cb447cc7e5827c82f31d2579 nvu-0.81.ebuild 2301
 MD5 a242ea1eef3d40a59e5c249fc8063345 nvu-0.90.ebuild 2301
-MD5 175a86273aba0fa96562131a3e96507f ChangeLog 2789
+MD5 6e2a468b0ce5b5c811862e5c7e8b3515 nvu-1.0_pre.ebuild 2330
 MD5 f04489cb980dbc4f22e78024f3e611e0 files/digest-nvu-0.50 71
 MD5 ddd36eaadabc8ed39da3369cdd50220a files/digest-nvu-0.60 71
+MD5 2c903c369e8f7450ba419eb7ea8050f1 files/digest-nvu-0.81 71
+MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90 71
 MD5 73b0f49343fb2c309bdd2721ab8a4012 files/mozconfig 2130
+MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160
 MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/nvu-0.50-dir.patch 713
+MD5 952edf776beb47f9ddeeed1eb3a9407f files/nvu-0.50-freetype-compile.patch 13641
 MD5 7880f1109c0f8a9df0830238e70b0d62 files/nvu-0.50-nvu.patch 674
 MD5 fedceb24f98d16efe7580f4c2877afca files/nvu.desktop 182
-MD5 2c903c369e8f7450ba419eb7ea8050f1 files/digest-nvu-0.81 71
-MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160
-MD5 952edf776beb47f9ddeeed1eb3a9407f files/nvu-0.50-freetype-compile.patch 13641
-MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90 71
+MD5 565f1133c57a789f0cf51c02510a6f9c files/mozconfig-1.0PR 1367
+MD5 ed3ccc4c9deab00dc6df2930061efd76 files/digest-nvu-1.0_pre 72
diff --git a/app-editors/nvu/files/digest-nvu-0.50 b/app-editors/nvu/files/digest-nvu-0.50
deleted file mode 100644
index a2f1b74828c8..000000000000
--- a/app-editors/nvu/files/digest-nvu-0.50
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd2f677aebc3a7e90df4bdb848774788 nvu-0.50-sources.tar.bz2 31368442
diff --git a/app-editors/nvu/files/digest-nvu-0.60 b/app-editors/nvu/files/digest-nvu-0.60
deleted file mode 100644
index f128794c859b..000000000000
--- a/app-editors/nvu/files/digest-nvu-0.60
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d43bd909379606cd35f07109fbdc622f nvu-0.60-sources.tar.bz2 31795255
diff --git a/app-editors/nvu/files/digest-nvu-1.0_pre b/app-editors/nvu/files/digest-nvu-1.0_pre
new file mode 100644
index 000000000000..34536e760aae
--- /dev/null
+++ b/app-editors/nvu/files/digest-nvu-1.0_pre
@@ -0,0 +1 @@
+MD5 fced9ea7e2ac1fada8d4b3e730368b67 nvu-1.0PR-sources.tar.bz2 29842142
diff --git a/app-editors/nvu/files/mozconfig b/app-editors/nvu/files/mozconfig-1.0PR
index ae81dc8f0264..c98a5cba9e0c 100644
--- a/app-editors/nvu/files/mozconfig
+++ b/app-editors/nvu/files/mozconfig-1.0PR
@@ -4,35 +4,9 @@ export BUILD_OFFICIAL=1
 export MOZ_STANDALONE_COMPOSER=1
 mk_add_options MOZ_STANDALONE_COMPOSER=1
 
-# if you want don't want to use gcc and g++ or want to use
-# a specific version of the compilers, specify it in the
-# two following lines and uncomment them
-#export CC="gcc-3.0"
-#export CXX="g++-3.0"
-
-# Uncomment the 3 following lines on Debian (this includes
-# Linspire)
-#export OS_LIBS="-lc -lpthread"
-#export CFLAGS="-DDEBIAN"
-#export CXXFLAGS="-DDEBIAN"
-
-# Uncomment the two following lines on Linspire
-#export LINSPIRE=1
-#mk_add_options LINSPIRE=1
-
-# Uncomment and edit this line if you want to build
-# outside of the source tree
-#mk_add_options MOZ_OBJDIR=/home/glazman/nvu-0.50
-
-# Uncomment the following lines for an optimized build
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-
-# You may need to uncomment and edit that line. On Linspire,
-# just uncomment it
 ac_add_options --with-default-mozilla-five-home=/usr/lib/nvu
-
-# You probably have nothing to change below that line
 ac_add_options  --disable-svg
 ac_add_options  --without-system-mng
 ac_add_options  --without-system-png
@@ -44,9 +18,9 @@ ac_add_options  --disable-activex-scripting
 ac_add_options  --disable-tests
 ac_add_options  --disable-oji
 ac_add_options  --disable-necko-disk-cache
+ac_add_options  --enable-single-profile
 ac_add_options  --disable-profilesharing
-ac_add_options  --enable-extensions=wallet,spellcheck,xmlextras,pref,universalchardet,editor/cascades,venkman,inspector
-ac_add_options  --enable-image-decoders=png,gif,jpeg
+ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
 ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
 ac_add_options  --disable-pedantic
 ac_add_options  --disable-short-wchar
@@ -55,8 +29,9 @@ ac_add_options  --enable-strip-libs
 ac_add_options  --enable-crypto
 ac_add_options  --disable-mathml
 ac_add_options  --with-system-zlib
-ac_add_options  --enable-freetype2
 ac_add_options  --enable-toolkit=gtk2
 ac_add_options  --enable-default-toolkit=gtk2
 ac_add_options  --enable-xft
+ac_add_options  --enable-freetype2
+ac_add_options  --disable-short-wchar
 ac_add_options  --prefix=/usr
diff --git a/app-editors/nvu/nvu-0.50.ebuild b/app-editors/nvu/nvu-0.50.ebuild
deleted file mode 100644
index f8d47ba01abf..000000000000
--- a/app-editors/nvu/nvu-0.50.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-0.50.ebuild,v 1.1 2005/03/23 16:43:16 seemant Exp $
-
-inherit eutils mozilla flag-o-matic
-
-DESCRIPTION="A WYSIWG web editor for linux similiar to Dreamweaver"
-HOMEPAGE="http://www.nvu.com/"
-SRC_URI="http://cvs.nvu.com/download/${P}-sources.tar.bz2"
-LICENSE="MPL-1.1"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
-DEPEND="sys-apps/gawk
-		dev-lang/perl
-		app-doc/doxygen"
-
-S=${WORKDIR}/mozilla
-
-src_compile() {
-
-	# I had to manually edit the mozconfig.linux file as it
-	# has some quirks... just copy the darn thing over :) - Chris
-	cp ${FILESDIR}/mozconfig ${S}/.mozconfig
-
-	# Fix those darn directories!  Make something more "standard"
-	# That can extend to future versions with much more ease. - Chris
-	epatch ${FILESDIR}/${P}-dir.patch
-
-	# The build system is a weeee bit sensitive to naughty -O flags.
-	# filter them out and let the build system figure out what
-	# won't let it die :) - Chris
-	filter-flags '-O*'
-
-	make -f client.mk build_all
-}
-
-src_install() {
-
-	# patch the final nvu binary to workaround bug #67658
-	epatch ${FILESDIR}/${P}-nvu.patch
-
-	make -f client.mk DESTDIR=${D} install || die
-
-	#menu entry for gnome/kde
-	insinto /usr/share/applications
-	doins ${FILESDIR}/nvu.desktop
-}
diff --git a/app-editors/nvu/nvu-0.60.ebuild b/app-editors/nvu/nvu-1.0_pre.ebuild
index 10e5e85b186b..d2ede49fdb87 100644
--- a/app-editors/nvu/nvu-0.60.ebuild
+++ b/app-editors/nvu/nvu-1.0_pre.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-0.60.ebuild,v 1.1 2005/03/23 16:43:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0_pre.ebuild,v 1.1 2005/04/14 22:57:03 anarchy Exp $
 
 inherit eutils mozilla flag-o-matic
 
+MY_PV=${P/_pre/PR}
+
 DESCRIPTION="A WYSIWG web editor for linux similiar to Dreamweaver"
 HOMEPAGE="http://www.nvu.com/"
-SRC_URI="http://cvs.nvu.com/download/${P}-sources.tar.bz2"
+SRC_URI="http://cvs.nvu.com/download/${MY_PV}-sources.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 DEPEND="sys-apps/gawk
-		dev-lang/perl
-		app-doc/doxygen"
+	dev-lang/perl
+	app-doc/doxygen
+	>=media-libs/freetype-2.1.9-r1"
 
 S=${WORKDIR}/mozilla
 
@@ -24,13 +27,14 @@ src_unpack() {
 	# Fix those darn directories!  Make something more "standard"
 	# That can extend to future versions with much more ease. - Chris
 	epatch ${FILESDIR}/nvu-0.50-dir.patch
+	epatch ${FILESDIR}/nvu-0.50-freetype-compile.patch
 
 	# I had to manually edit the mozconfig.linux file as it
 	# has some quirks... just copy the darn thing over :) - Chris
 	# cp ${FILESDIR}/mozconfig ${S}/.mozconfig
 	# remove --enable-optimize and let the code below
 	# add the appropriate one - basic
-	grep -v enable-optimize ${FILESDIR}/mozconfig > .mozconfig
+	grep -v enable-optimize ${FILESDIR}/mozconfig-1.0PR > .mozconfig
 
 	# copied from mozilla.eclass (modified slightly),
 	# otherwise it defaults to -O which crashes on startup for me - basic
@@ -53,6 +57,7 @@ src_compile() {
 	# filter them out and let the build system figure out what
 	# won't let it die :) - Chris
 	filter-flags '-O*'
+	# epatch ${FILESDIR}/nvu-0.80-mozconfig.patch
 
 	make -f client.mk build_all
 }