From 07186f8e6e4f9567c46956de3a3e829dde0b90aa Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Tue, 15 Jun 2004 02:37:59 +0000 Subject: Fix use invocation. Get rid of subshell in src_install so that error-checking can be done. Add error-checking. --- net-p2p/gtk-gnutella/ChangeLog | 8 +++++++- net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild | 13 +++++-------- net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild | 10 ++++------ net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild | 21 +++++++++------------ net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild | 21 +++++++++------------ net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild | 15 +++++++-------- 6 files changed, 41 insertions(+), 47 deletions(-) (limited to 'net-p2p') diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog index e56115f0a4d5..d2a1f3659f09 100644 --- a/net-p2p/gtk-gnutella/ChangeLog +++ b/net-p2p/gtk-gnutella/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/gtk-gnutella # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.27 2004/06/06 21:03:51 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.28 2004/06/15 02:37:59 agriffis Exp $ + + 14 Jun 2004; Aron Griffis gtk-gnutella-0.91.1.ebuild, + gtk-gnutella-0.92.ebuild, gtk-gnutella-0.93-r1.ebuild, + gtk-gnutella-0.93.3.ebuild, gtk-gnutella-0.93.ebuild: + Fix use invocation. Get rid of subshell in src_install so that error-checking + can be done. Add error-checking. 06 Jun 2004; Jason Wever gtk-gnutella-0.93.3.ebuild: Stable on sparc. diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild index 6c07bea0561d..7fa16a38380a 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild,v 1.8 2004/05/04 05:06:31 eradicator Exp $ - -IUSE="" +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild,v 1.9 2004/06/15 02:37:59 agriffis Exp $ IUSE="" @@ -28,12 +26,11 @@ src_compile() { } src_install () { - make DESTDIR=${D} install || die - dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO + dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO || die - use gnome && ( \ + if use gnome; then insinto /usr/share/gnome/apps/Internet - doins ${FILESDIR}/gtk-gnutella.desktop - ) + doins ${FILESDIR}/gtk-gnutella.desktop || die + fi } diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild index c996a8604168..5bda0439a88a 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild,v 1.5 2004/03/14 05:37:44 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild,v 1.6 2004/06/15 02:37:59 agriffis Exp $ IUSE="gnome" @@ -21,19 +21,17 @@ DEPEND="=x11-libs/gtk+-1.2* =dev-libs/glib-1.2*" src_compile() { - # econf `use_enable gtk2`|| die "Configure failed" econf || die "Configure failed" emake || die "Make failed" } src_install () { - einstall || die "Install failed" dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO - use gnome && ( \ + if use gnome; then insinto /usr/share/gnome/apps/Internet - doins ${FILESDIR}/gtk-gnutella.desktop - ) + doins ${FILESDIR}/gtk-gnutella.desktop || die + fi } diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild index 90e5335a426f..b1277871e4e2 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild,v 1.5 2004/05/06 02:02:16 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild,v 1.6 2004/06/15 02:37:59 agriffis Exp $ IUSE="gnome gtk2 xml2 nls" @@ -20,22 +20,21 @@ DEPEND="xml2? ( dev-libs/libxml2 ) nls? ( >=sys-devel/gettext-0.11.5 )" src_compile() { - local myconf - if [ `use gtk2` ]; then + if use gtk2; then myconf="-Dgtkversion=2" else myconf="-Dgtkversion=1" fi - if [ `use xml2` ]; then + if use xml2; then myconf="${myconf} -Dd_libxml2" else myconf="${myconf} -Ud_libxml2" fi - if [ `use nls` ]; then + if use nls; then myconf="${myconf} -Dd_enablenls -Dgmsgfmt=\"/usr/bin/msgfmt\" -Dmsgfmt=\"/usr/bin/msgfmt\"" else myconf="${myconf} -Ud_enablenls" @@ -53,21 +52,19 @@ src_compile() { } src_install() { - dodir /usr/bin make INSTALL_PREFIX=${D} install || die "Install failed" find ${D}/usr/share -type f -exec chmod a-x {} \; dodoc AUTHORS ChangeLog README TODO - use gnome && ( \ - insinto /usr/share/gnome/apps/Internet + if use gnome; then + insinto /usr/share/gnome/apps/Internet || die doins ${FILESDIR}/gtk-gnutella.desktop - ) + fi } pkg_postinst() { - - if [ `use gtk2` ]; then + if use gtk2; then ewarn "The GTK2 interface currently does not have a maintainer--not all" ewarn "options which are available in the GTK1 interface might have made" ewarn "it in the GTK2 interface. The GTK2 interface also" @@ -76,7 +73,7 @@ pkg_postinst() { echo fi - if [ ! `use xml2` ]; then + if ! use xml2; then ewarn "You have installed gtk-gnutella without xml2 support. As such, your" ewarn "search filters may not be saved when you quit the application." einfo "If you would like this feature enabled, re-emerge with USE=\"xml2\"." diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild index f6963c6168a4..3ce23e1e3028 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild,v 1.5 2004/06/06 21:03:51 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.3.ebuild,v 1.6 2004/06/15 02:37:59 agriffis Exp $ IUSE="gnome gtk2 xml2 nls" @@ -20,22 +20,21 @@ DEPEND="xml2? ( dev-libs/libxml2 ) nls? ( >=sys-devel/gettext-0.11.5 )" src_compile() { - local myconf - if [ `use gtk2` ]; then + if use gtk2; then myconf="-Dgtkversion=2" else myconf="-Dgtkversion=1" fi - if [ `use xml2` ]; then + if use xml2; then myconf="${myconf} -Dd_libxml2" else myconf="${myconf} -Ud_libxml2" fi - if [ `use nls` ]; then + if use nls; then myconf="${myconf} -Dd_enablenls -Dgmsgfmt=\"/usr/bin/msgfmt\" -Dmsgfmt=\"/usr/bin/msgfmt\"" else myconf="${myconf} -Ud_enablenls" @@ -53,21 +52,19 @@ src_compile() { } src_install() { - dodir /usr/bin make INSTALL_PREFIX=${D} install || die "Install failed" find ${D}/usr/share -type f -exec chmod a-x {} \; dodoc AUTHORS ChangeLog README TODO - use gnome && ( \ + if use gnome; then insinto /usr/share/gnome/apps/Internet - doins ${FILESDIR}/gtk-gnutella.desktop - ) + doins ${FILESDIR}/gtk-gnutella.desktop || die + fi } pkg_postinst() { - - if [ `use gtk2` ]; then + if use gtk2; then ewarn "The GTK2 interface currently does not have a maintainer--not all" ewarn "options which are available in the GTK1 interface might have made" ewarn "it in the GTK2 interface. The GTK2 interface also" @@ -76,7 +73,7 @@ pkg_postinst() { echo fi - if [ ! `use xml2` ]; then + if ! use xml2; then ewarn "You have installed gtk-gnutella without xml2 support. As such, your" ewarn "search filters may not be saved when you quit the application." einfo "If you would like this feature enabled, re-emerge with USE=\"xml2\"." diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild index 357bfc716a32..499ec3236aa6 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild,v 1.6 2004/05/06 02:02:16 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild,v 1.7 2004/06/15 02:37:59 agriffis Exp $ IUSE="gnome gtk2 nls" @@ -22,12 +22,12 @@ DEPEND="gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* ) DEPEND="${DEPEND} || ( dev-util/yacc sys-devel/bison )" src_compile() { - if [ `use gtk2` ]; then + if use gtk2; then GTK_VER=2 else GTK_VER=1 fi - if [ `use nls` ]; then + if use nls; then USE_NLS=y else USE_NLS=n @@ -71,17 +71,16 @@ EOF } src_install () { - make INSTALL_PREFIX=${D} install || die "Install failed" dodoc AUTHORS ChangeLog LICENSE MANIFEST README TODO doc - use gnome && ( \ + if use gnome; then insinto /usr/share/gnome/apps/Internet - doins ${FILESDIR}/gtk-gnutella.desktop - ) + doins ${FILESDIR}/gtk-gnutella.desktop || die + fi } pkg_postinst () { - if [ `use gtk2` ]; then + if use gtk2; then ewarn "You have enabled the GTK2 build of gtk-gnutella, there" ewarn "is a known bug which causes an invalid assertion if" ewarn "you select passive search" -- cgit v1.2.3-65-gdbad