From 8d4f390582712b7b08b8dd51805e48d0cb7b216e Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Mon, 3 Oct 2005 00:52:53 +0000 Subject: mozilla.eclass dropped in favor of mozconfig.eclass for gtk2 depreciation (Portage version: 2.0.53_rc3) --- app-editors/nvu/ChangeLog | 8 ++- app-editors/nvu/Manifest | 20 +++++--- app-editors/nvu/files/digest-nvu-0.90-r2 | 1 + app-editors/nvu/files/digest-nvu-1.0-r1 | 1 + app-editors/nvu/nvu-0.90-r2.ebuild | 73 ++++++++++++++++++++++++++++ app-editors/nvu/nvu-1.0-r1.ebuild | 83 ++++++++++++++++++++++++++++++++ 6 files changed, 177 insertions(+), 9 deletions(-) create mode 100644 app-editors/nvu/files/digest-nvu-0.90-r2 create mode 100644 app-editors/nvu/files/digest-nvu-1.0-r1 create mode 100644 app-editors/nvu/nvu-0.90-r2.ebuild create mode 100644 app-editors/nvu/nvu-1.0-r1.ebuild (limited to 'app-editors') diff --git a/app-editors/nvu/ChangeLog b/app-editors/nvu/ChangeLog index ad05b1045f7d..5d071c1005fc 100644 --- a/app-editors/nvu/ChangeLog +++ b/app-editors/nvu/ChangeLog @@ -1,6 +1,12 @@ # 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.10 2005/07/01 13:28:05 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.11 2005/10/03 00:52:53 anarchy Exp $ + +*nvu-1.0-r1 (03 Oct 2005) +*nvu-0.90-r2 (03 Oct 2005) + + 03 Oct 2005; +nvu-0.90-r2.ebuild, +nvu-1.0-r1.ebuild: + changed from mozilla.eclass to mozconfig.eclass to clean up gtk2 *nvu-1.0 (01 Jul 2005) diff --git a/app-editors/nvu/Manifest b/app-editors/nvu/Manifest index 5afb44b7cc25..8b11cbef5825 100644 --- a/app-editors/nvu/Manifest +++ b/app-editors/nvu/Manifest @@ -1,13 +1,17 @@ MD5 184dfdd4b52f954b43e84cc7456630b6 ChangeLog 4313 -MD5 2f058933e09a68513c1ca3022b81a441 metadata.xml 433 -MD5 1b0b169cd47eb58ed4314dc19ce4d36a nvu-0.90-r1.ebuild 2312 -MD5 0b88e349c78fa37c9a0fe79c75ac99ee nvu-1.0.ebuild 2882 -MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0 70 -MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r1 71 -MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160 -MD5 c68ab50fa971f53df6ae113289920242 files/1.0/nvu-1.0-gcc4.patch 1924 +MD5 565f1133c57a789f0cf51c02510a6f9c files/1.0/mozconfig-1.0 1367 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 c68ab50fa971f53df6ae113289920242 files/1.0/nvu-1.0-gcc4.patch 1924 MD5 bde161b6920a9f919de3eb400506b6a7 files/1.0/nvu.desktop 182 +MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r1 71 +MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r2 71 +MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0 70 +MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0-r1 70 +MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160 +MD5 2f058933e09a68513c1ca3022b81a441 metadata.xml 433 +MD5 1b0b169cd47eb58ed4314dc19ce4d36a nvu-0.90-r1.ebuild 2312 +MD5 ec3b799ee9314babe1fbe66abd42c211 nvu-0.90-r2.ebuild 2314 +MD5 c09aa7de902df1d01cbda770dbf0cbd2 nvu-1.0-r1.ebuild 2884 +MD5 0b88e349c78fa37c9a0fe79c75ac99ee nvu-1.0.ebuild 2882 diff --git a/app-editors/nvu/files/digest-nvu-0.90-r2 b/app-editors/nvu/files/digest-nvu-0.90-r2 new file mode 100644 index 000000000000..2b85be282b8e --- /dev/null +++ b/app-editors/nvu/files/digest-nvu-0.90-r2 @@ -0,0 +1 @@ +MD5 d88dd587250afdc3e84e864e8e2b3cc2 nvu-0.90-sources.tar.bz2 29785795 diff --git a/app-editors/nvu/files/digest-nvu-1.0-r1 b/app-editors/nvu/files/digest-nvu-1.0-r1 new file mode 100644 index 000000000000..0c332e743de9 --- /dev/null +++ b/app-editors/nvu/files/digest-nvu-1.0-r1 @@ -0,0 +1 @@ +MD5 ae0f7c85e230ce8a90dc438b53be06e6 nvu-1.0-sources.tar.bz2 29687976 diff --git a/app-editors/nvu/nvu-0.90-r2.ebuild b/app-editors/nvu/nvu-0.90-r2.ebuild new file mode 100644 index 000000000000..bdc2645bec5c --- /dev/null +++ b/app-editors/nvu/nvu-0.90-r2.ebuild @@ -0,0 +1,73 @@ +# 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-r2.ebuild,v 1.1 2005/10/03 00:52:53 anarchy Exp $ + +inherit eutils mozconfig 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}/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 + # 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}/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 +} diff --git a/app-editors/nvu/nvu-1.0-r1.ebuild b/app-editors/nvu/nvu-1.0-r1.ebuild new file mode 100644 index 000000000000..2c7cbd13221e --- /dev/null +++ b/app-editors/nvu/nvu-1.0-r1.ebuild @@ -0,0 +1,83 @@ +# 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-r1.ebuild,v 1.1 2005/10/03 00:52:53 anarchy Exp $ + +inherit eutils mozconfig 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}/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}/1.0/mozconfig-1.0 > .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 || die "Make failed" +} + +src_install() { + + # patch the final nvu binary to workaround bug #67658 + 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}/1.0/nvu.desktop +} + +pkg_postinst() { + einfo "If you choose to setup the webbrowser feature to execute urls" + einfo "under the HELP section please refer to" + einfo "http://www.nvu.com/Building_From_Source.html#tipsandhints ." + einfo "Make sure you follow the instructions to the letter if you have" + einfo "any problems email me at anarchy@gentoo.org I will be more then" + einfo "happy to assist you. DO NOT file a bug report on this issue." +} -- cgit v1.2.3-65-gdbad