revision bump, clean up

(Portage version: 2.0.51.22-r1)

17 files changed, 36 insertions, 242 deletions

diff --git a/app-editors/nvu/ChangeLog b/app-editors/nvu/ChangeLog
index e314875a8a10..ad05b1045f7d 100644
--- a/app-editors/nvu/ChangeLog
+++ b/app-editors/nvu/ChangeLog
@@ -1,6 +1,18 @@
 # 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.9 2005/06/20 03:46:36 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.10 2005/07/01 13:28:05 anarchy Exp $
+
+*nvu-1.0 (01 Jul 2005)
+
+  01 Jul 2005; Jory A. Pratt <anarchy@gentoo.org> +files/1.0/nvu-0.50-dir.patch,
+  +files/1.0/nvu-0.50-freetype-compile.patch, +files/1.0/nvu-0.50-nvu.patch,
+  -files/mozconfig2, -files/nvu-0.50-dir.patch,
+  -files/nvu-0.50-freetype-compile.patch, -files/nvu-0.50-nvu.patch,
+  +files/1.0/mozconfig-1.0, +files/1.0/nvu-1.0-gcc4.patch,
+  -files/mozconfig-1.0PR, -files/nvu-1.0_pre-gcc4.patch,
+  +files/1.0/nvu.desktop, -files/nvu.desktop, -nvu-0.81.ebuild,
+  -nvu-0.90.ebuild, nvu-0.90-r1.ebuild, +nvu-1.0.ebuild:
+  revision bump 1.0 final. CleanUp.
 
   20 Jun 2005; <anarchy@gentoo.org> files/nvu.desktop:
   fixed bug #96532
diff --git a/app-editors/nvu/Manifest b/app-editors/nvu/Manifest
index 6f7c60fc990c..7236516b06fd 100644
--- a/app-editors/nvu/Manifest
+++ b/app-editors/nvu/Manifest
@@ -1,17 +1,12 @@
-MD5 9d5c57f5db67283976551312d5c7ac58 ChangeLog 3739
+MD5 840ae9823637ec3bce267091123c21b0 ChangeLog 4312
 MD5 2f058933e09a68513c1ca3022b81a441 metadata.xml 433
-MD5 e3b4ccc9cb447cc7e5827c82f31d2579 nvu-0.81.ebuild 2301
-MD5 c05340442ff08d09be9375f467bd735b nvu-0.90-r1.ebuild 2299
-MD5 a242ea1eef3d40a59e5c249fc8063345 nvu-0.90.ebuild 2301
-MD5 c60a7386dc2f20e29032f90f0cf56fd7 nvu-1.0_pre.ebuild 2888
-MD5 2c903c369e8f7450ba419eb7ea8050f1 files/digest-nvu-0.81 71
-MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90 71
+MD5 ecad0c1e2c9f55a4ffc7ab400e702192 nvu-0.90-r1.ebuild 2311
+MD5 9aab451f428dca3b7c9c43d57ce4aaa2 nvu-1.0.ebuild 2886
+MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0 70
 MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r1 71
-MD5 ed3ccc4c9deab00dc6df2930061efd76 files/digest-nvu-1.0_pre 72
-MD5 565f1133c57a789f0cf51c02510a6f9c files/mozconfig-1.0PR 1367
-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 bde161b6920a9f919de3eb400506b6a7 files/nvu.desktop 182
-MD5 c68ab50fa971f53df6ae113289920242 files/nvu-1.0_pre-gcc4.patch 1924
+MD5 c68ab50fa971f53df6ae113289920242 files/1.0/nvu-1.0-gcc4.patch 1924
+MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/1.0/nvu-0.50-dir.patch 713
+MD5 952edf776beb47f9ddeeed1eb3a9407f files/1.0/nvu-0.50-freetype-compile.patch 13641
+MD5 7880f1109c0f8a9df0830238e70b0d62 files/1.0/nvu-0.50-nvu.patch 674
+MD5 565f1133c57a789f0cf51c02510a6f9c files/1.0/mozconfig-1.0 1367
+MD5 bde161b6920a9f919de3eb400506b6a7 files/1.0/nvu.desktop 182
diff --git a/app-editors/nvu/files/mozconfig-1.0PR b/app-editors/nvu/files/1.0/mozconfig-1.0
index c98a5cba9e0c..c98a5cba9e0c 100644
--- a/app-editors/nvu/files/mozconfig-1.0PR
+++ b/app-editors/nvu/files/1.0/mozconfig-1.0
diff --git a/app-editors/nvu/files/nvu-0.50-dir.patch b/app-editors/nvu/files/1.0/nvu-0.50-dir.patch
index 4720de24c5d5..4720de24c5d5 100644
--- a/app-editors/nvu/files/nvu-0.50-dir.patch
+++ b/app-editors/nvu/files/1.0/nvu-0.50-dir.patch
diff --git a/app-editors/nvu/files/nvu-0.50-freetype-compile.patch b/app-editors/nvu/files/1.0/nvu-0.50-freetype-compile.patch
index 0bef6ad0a0f5..0bef6ad0a0f5 100644
--- a/app-editors/nvu/files/nvu-0.50-freetype-compile.patch
+++ b/app-editors/nvu/files/1.0/nvu-0.50-freetype-compile.patch
diff --git a/app-editors/nvu/files/nvu-0.50-nvu.patch b/app-editors/nvu/files/1.0/nvu-0.50-nvu.patch
index 636607062835..636607062835 100644
--- a/app-editors/nvu/files/nvu-0.50-nvu.patch
+++ b/app-editors/nvu/files/1.0/nvu-0.50-nvu.patch
diff --git a/app-editors/nvu/files/nvu-1.0_pre-gcc4.patch b/app-editors/nvu/files/1.0/nvu-1.0-gcc4.patch
index e7a64e1f6f24..e7a64e1f6f24 100644
--- a/app-editors/nvu/files/nvu-1.0_pre-gcc4.patch
+++ b/app-editors/nvu/files/1.0/nvu-1.0-gcc4.patch
diff --git a/app-editors/nvu/files/nvu.desktop b/app-editors/nvu/files/1.0/nvu.desktop
index f27907d63b18..f27907d63b18 100644
--- a/app-editors/nvu/files/nvu.desktop
+++ b/app-editors/nvu/files/1.0/nvu.desktop
diff --git a/app-editors/nvu/files/digest-nvu-0.81 b/app-editors/nvu/files/digest-nvu-0.81
deleted file mode 100644
index 236fab3ee324..000000000000
--- a/app-editors/nvu/files/digest-nvu-0.81
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7287dca818596df8f58031af7819c330 nvu-0.81-sources.tar.bz2 29706074
diff --git a/app-editors/nvu/files/digest-nvu-0.90 b/app-editors/nvu/files/digest-nvu-0.90
deleted file mode 100644
index 2b85be282b8e..000000000000
--- a/app-editors/nvu/files/digest-nvu-0.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d88dd587250afdc3e84e864e8e2b3cc2 nvu-0.90-sources.tar.bz2 29785795
diff --git a/app-editors/nvu/files/digest-nvu-1.0 b/app-editors/nvu/files/digest-nvu-1.0
new file mode 100644
index 000000000000..0c332e743de9
--- /dev/null
+++ b/app-editors/nvu/files/digest-nvu-1.0
@@ -0,0 +1 @@
+MD5 ae0f7c85e230ce8a90dc438b53be06e6 nvu-1.0-sources.tar.bz2 29687976
diff --git a/app-editors/nvu/files/digest-nvu-1.0_pre b/app-editors/nvu/files/digest-nvu-1.0_pre
deleted file mode 100644
index 34536e760aae..000000000000
--- a/app-editors/nvu/files/digest-nvu-1.0_pre
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fced9ea7e2ac1fada8d4b3e730368b67 nvu-1.0PR-sources.tar.bz2 29842142
diff --git a/app-editors/nvu/files/mozconfig2 b/app-editors/nvu/files/mozconfig2
deleted file mode 100644
index be4da7f65981..000000000000
--- a/app-editors/nvu/files/mozconfig2
+++ /dev/null
@@ -1,63 +0,0 @@
-export MOZILLA_OFFICIAL=1
-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
-ac_add_options  --disable-ldap
-ac_add_options  --disable-mailnews
-ac_add_options  --disable-installer
-ac_add_options  --disable-activex
-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  --disable-profilesharing
-ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
-ac_add_options  --enable-image-decoders=png,gif,jpeg
-ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
-ac_add_options  --disable-pedantic
-ac_add_options  --disable-short-wchar
-ac_add_options  --enable-xprint
-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  --prefix=/usr
-ac_add_options  --enable-single-profile
diff --git a/app-editors/nvu/nvu-0.81.ebuild b/app-editors/nvu/nvu-0.81.ebuild
deleted file mode 100644
index c17db88a4894..000000000000
--- a/app-editors/nvu/nvu-0.81.ebuild
+++ /dev/null
@@ -1,73 +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.81.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="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
-DEPEND="sys-apps/gawk
-	dev-lang/perl
-	app-doc/doxygen
-	>=media-libs/freetype-2.1.9-r1"
-
-S=${WORKDIR}/mozilla
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# 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}/mozconfig2 > .mozconfig
-
-	# copied from mozilla.eclass (modified slightly),
-	# otherwise it defaults to -O which crashes on startup for me - basic
-	# Set optimization level based on CFLAGS
-	if is-flag -O0; then
-		echo 'ac_add_options --enable-optimize=-O0' >> .mozconfig
-	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
-		# more than -O1 causes segfaults on 64-bit (bug 33767)
-		echo 'ac_add_options --enable-optimize=-O1' >> .mozconfig
-	elif is-flag -O1; then
-		echo 'ac_add_options --enable-optimize=-O1' >> .mozconfig
-	else
-		# mozilla fallback
-		echo 'ac_add_options --enable-optimize=-O2' >> .mozconfig
-	fi
-}
-
-src_compile() {
-	# 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*'
-	# epatch ${FILESDIR}/nvu-0.80-mozconfig.patch
-
-	make -f client.mk build_all
-}
-
-src_install() {
-
-	# patch the final nvu binary to workaround bug #67658
-	epatch ${FILESDIR}/nvu-0.50-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.90-r1.ebuild b/app-editors/nvu/nvu-0.90-r1.ebuild
index c0305176d22c..d090448edd2a 100644
--- a/app-editors/nvu/nvu-0.90-r1.ebuild
+++ b/app-editors/nvu/nvu-0.90-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.90-r1.ebuild,v 1.2 2005/04/29 23:15:25 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-0.90-r1.ebuild,v 1.3 2005/07/01 13:28:05 anarchy Exp $
 
 inherit eutils mozilla flag-o-matic
 
@@ -24,8 +24,8 @@ src_unpack() {
 	cd ${S}
 	# 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
+	epatch ${FILESDIR}/1.0/nvu-0.50-dir.patch
+	epatch ${FILESDIR}/1.0/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
@@ -63,7 +63,7 @@ src_compile() {
 src_install() {
 
 	# patch the final nvu binary to workaround bug #67658
-	epatch ${FILESDIR}/nvu-0.50-nvu.patch
+	epatch ${FILESDIR}/1.0/nvu-0.50-nvu.patch
 
 	make -f client.mk DESTDIR=${D} install || die
 
diff --git a/app-editors/nvu/nvu-0.90.ebuild b/app-editors/nvu/nvu-0.90.ebuild
deleted file mode 100644
index c0dd6e214f4c..000000000000
--- a/app-editors/nvu/nvu-0.90.ebuild
+++ /dev/null
@@ -1,73 +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.90.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="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
-DEPEND="sys-apps/gawk
-	dev-lang/perl
-	app-doc/doxygen
-	>=media-libs/freetype-2.1.9-r1"
-
-S=${WORKDIR}/mozilla
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# 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}/mozconfig2 > .mozconfig
-
-	# copied from mozilla.eclass (modified slightly),
-	# otherwise it defaults to -O which crashes on startup for me - basic
-	# Set optimization level based on CFLAGS
-	if is-flag -O0; then
-		echo 'ac_add_options --enable-optimize=-O0' >> .mozconfig
-	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
-		# more than -O1 causes segfaults on 64-bit (bug 33767)
-		echo 'ac_add_options --enable-optimize=-O1' >> .mozconfig
-	elif is-flag -O1; then
-		echo 'ac_add_options --enable-optimize=-O1' >> .mozconfig
-	else
-		# mozilla fallback
-		echo 'ac_add_options --enable-optimize=-O2' >> .mozconfig
-	fi
-}
-
-src_compile() {
-	# 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*'
-	# epatch ${FILESDIR}/nvu-0.80-mozconfig.patch
-
-	make -f client.mk build_all
-}
-
-src_install() {
-
-	# patch the final nvu binary to workaround bug #67658
-	epatch ${FILESDIR}/nvu-0.50-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-1.0_pre.ebuild b/app-editors/nvu/nvu-1.0.ebuild
index fcd47a04c500..ac3cfbbe09b2 100644
--- a/app-editors/nvu/nvu-1.0_pre.ebuild
+++ b/app-editors/nvu/nvu-1.0.ebuild
@@ -1,14 +1,12 @@
 # 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-1.0_pre.ebuild,v 1.4 2005/06/20 02:51:38 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0.ebuild,v 1.1 2005/07/01 13:28:05 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/${MY_PV}-sources.tar.bz2"
+SRC_URI="http://cvs.nvu.com/download/${P}-sources.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -26,16 +24,16 @@ src_unpack() {
 	cd ${S}
 	# 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 || die "failed to apply dir. patch"
-	epatch ${FILESDIR}/nvu-0.50-freetype-compile.patch || die "failed to patch for freetype"
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/1.0/nvu-0.50-dir.patch || die "failed to apply dir. patch"
+	epatch ${FILESDIR}/1.0/nvu-0.50-freetype-compile.patch || die "failed to patch for freetype"
+	epatch ${FILESDIR}/1.0/${P}-gcc4.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-1.0PR > .mozconfig
+	grep -v enable-optimize ${FILESDIR}/1.0/mozconfig-1.0 > .mozconfig
 
 	# copied from mozilla.eclass (modified slightly),
 	# otherwise it defaults to -O which crashes on startup for me - basic
@@ -66,13 +64,13 @@ src_compile() {
 src_install() {
 
 	# patch the final nvu binary to workaround bug #67658
-	epatch ${FILESDIR}/nvu-0.50-nvu.patch
+	epatch ${FILESDIR}/1.0/nvu-0.50-nvu.patch
 
 	make -f client.mk DESTDIR=${D} install || die
 
 	#menu entry for gnome/kde
 	insinto /usr/share/applications
-	doins ${FILESDIR}/nvu.desktop
+	doins ${FILESDIR}/1.0/nvu.desktop
 }
 
 pkg_postinst() {