From f79b4380c78dc032ee632d4795fb008d140ac338 Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Fri, 16 Jan 2004 21:38:35 +0000 Subject: Fix 1.0 problems, add masked dev release 1.99 --- gnome-extra/gnome-network/ChangeLog | 13 ++++++++-- gnome-extra/gnome-network/Manifest | 6 ++--- .../files/digest-gnome-network-1.99.5 | 1 + .../files/gnome-network-1.0.2-db_fix.patch | 15 +++++++++++ .../gnome-network/gnome-network-1.0.2-r1.ebuild | 27 ++++++++++++-------- .../gnome-network/gnome-network-1.99.5.ebuild | 29 ++++++++++++++++++++++ 6 files changed, 76 insertions(+), 15 deletions(-) create mode 100644 gnome-extra/gnome-network/files/digest-gnome-network-1.99.5 create mode 100644 gnome-extra/gnome-network/files/gnome-network-1.0.2-db_fix.patch create mode 100644 gnome-extra/gnome-network/gnome-network-1.99.5.ebuild (limited to 'gnome-extra/gnome-network') diff --git a/gnome-extra/gnome-network/ChangeLog b/gnome-extra/gnome-network/ChangeLog index 59d25f37c9bf..3b9e25c7e864 100644 --- a/gnome-extra/gnome-network/ChangeLog +++ b/gnome-extra/gnome-network/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for gnome-extra/gnome-network -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-network/ChangeLog,v 1.4 2003/02/12 06:53:30 vapier Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-network/ChangeLog,v 1.5 2004/01/16 21:38:25 foser Exp $ + +*gnome-network-1.99.5 (16 Jan 2004) + + 16 Jan 2004; foser gnome-network-1.99.5.ebuild : + New development release + + 16 Jan 2004; foser gnome-network-1.0.2-r1.ebuild : + Fixed problems with building vs. newer db headers (#27386) + Removed nls USE, seems broken 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords diff --git a/gnome-extra/gnome-network/Manifest b/gnome-extra/gnome-network/Manifest index d0005d4386ba..6ab479ad3599 100644 --- a/gnome-extra/gnome-network/Manifest +++ b/gnome-extra/gnome-network/Manifest @@ -1,6 +1,6 @@ -MD5 cd537260c3f2a702b5a94141948563ec gnome-network-1.99.5.ebuild 464 -MD5 1f3a2be51caf238a7bd445dcd0fe7625 gnome-network-1.0.2-r1.ebuild 1247 -MD5 c292b763cbf3377a4d45d3aec90e655b ChangeLog 783 +MD5 6cfb29e01f5dbd2da47266476c7055c8 gnome-network-1.99.5.ebuild 740 +MD5 3fed235c9df96c4383dc1ee2165185c2 gnome-network-1.0.2-r1.ebuild 1244 +MD5 e3e1550e5d4c460aba7f5a153fb6805c ChangeLog 946 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 a65af257115997c21e82848c0a4bcb4f files/digest-gnome-network-1.0.2-r1 72 MD5 23dad5479665e61efae339c1bc116f79 files/gnome-network-1.0.2-db_fix.patch 338 diff --git a/gnome-extra/gnome-network/files/digest-gnome-network-1.99.5 b/gnome-extra/gnome-network/files/digest-gnome-network-1.99.5 new file mode 100644 index 000000000000..dd42cb6bc116 --- /dev/null +++ b/gnome-extra/gnome-network/files/digest-gnome-network-1.99.5 @@ -0,0 +1 @@ +MD5 77532442a106d06ed2fe015f87d9b522 gnome-network-1.99.5.tar.bz2 660804 diff --git a/gnome-extra/gnome-network/files/gnome-network-1.0.2-db_fix.patch b/gnome-extra/gnome-network/files/gnome-network-1.0.2-db_fix.patch new file mode 100644 index 000000000000..9e9a3b51cb68 --- /dev/null +++ b/gnome-extra/gnome-network/files/gnome-network-1.0.2-db_fix.patch @@ -0,0 +1,15 @@ +--- gnome-network-1.0.2/sync/sync.h 1998-09-23 02:36:10.000000000 +0200 ++++ gnome-network-1.0.2/sync/sync.h.patched 2004-01-16 21:59:54.420765888 +0100 +@@ -27,11 +27,7 @@ + #include + #include + +-#ifdef HAVE_DB_185_H +-# include +-#else +-# include +-#endif ++#include + + #include "md5.h" + diff --git a/gnome-extra/gnome-network/gnome-network-1.0.2-r1.ebuild b/gnome-extra/gnome-network/gnome-network-1.0.2-r1.ebuild index f3257a99bce1..95f39387e9d8 100644 --- a/gnome-extra/gnome-network/gnome-network-1.0.2-r1.ebuild +++ b/gnome-extra/gnome-network/gnome-network-1.0.2-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-network/gnome-network-1.0.2-r1.ebuild,v 1.7 2003/09/06 23:52:56 msterret Exp $ - -IUSE="nls" +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-network/gnome-network-1.0.2-r1.ebuild,v 1.8 2004/01/16 21:38:25 foser Exp $ +IUSE="" S=${WORKDIR}/${P} DESCRIPTION="gnome-network" @@ -11,7 +10,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz" HOMEPAGE="http://www.gnome.org/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="x86 sparc " +KEYWORDS="x86 sparc" RDEPEND="=gnome-base/gnome-panel-1.4* =dev-util/guile-1.4* @@ -21,20 +20,28 @@ DEPEND="${RDEPEND} >=app-text/scrollkeeper-0.2 nls? ( sys-devel/gettext )" +src_unpack() { + + unpack ${A} + + cd ${S} + # Work around problems described in #27386 + epatch ${FILESDIR}/${P}-db_fix.patch + +} src_compile() { - local myconf - use nls || myconf="--disable-nls" CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`" - cp sync/sync.h sync/sync.h.old - cat sync/sync.h.old | sed -e s@db.h@db1/db.h@g > sync/sync.h - ./configure --host=${CHOST} \ + + ./configure \ + --host=${CHOST} \ --prefix=/usr \ --sysconfdir=/etc \ --without-gnome-sync \ --enable-static=no \ --localstatedir=/var/lib || die "configure failure. please report to http://bugs.gentoo.org" + emake || die "compile error" } diff --git a/gnome-extra/gnome-network/gnome-network-1.99.5.ebuild b/gnome-extra/gnome-network/gnome-network-1.99.5.ebuild new file mode 100644 index 000000000000..46b79538df67 --- /dev/null +++ b/gnome-extra/gnome-network/gnome-network-1.99.5.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-network/gnome-network-1.99.5.ebuild,v 1.1 2004/01/16 21:38:25 foser Exp $ + +inherit gnome2 debug + +DESCRIPTION="Collection of network tools" +HOMEPAGE="http://www.gnome.org/projects/gnome-network/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +IUSE="" + +# FIXME : probably missing runtime deps for gathering network statistics + +RDEPEND=">=dev-libs/glib-2 + >=x11-libs/gtk+-2 + >=gnome-base/gconf-1.2 + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=gnome-base/libglade-2" + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.11 + dev-util/pkgconfig" + +G2CONF="${G2CONF} --enable-debug" -- cgit v1.2.3-65-gdbad