cleanup and gnet dep fix

14 files changed, 16 insertions, 286 deletions

diff --git a/net-im/gnomeicu/ChangeLog b/net-im/gnomeicu/ChangeLog
index b1ffff7beb68..4de6093eab79 100644
--- a/net-im/gnomeicu/ChangeLog
+++ b/net-im/gnomeicu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gnomeicu
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/ChangeLog,v 1.19 2003/04/03 00:10:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/ChangeLog,v 1.20 2003/05/09 22:42:31 liquidx Exp $
+
+  09 May 2003; Alastair Tse <liquidx@gentoo.org> gnomeicu-0.98.111-r1.ebuild,
+  gnomeicu-0.99-r1.ebuild:
+  fix gnet deps and scrollkeeper fix
 
 *gnomeicu-0.99-r1 (18 mar 2003)
 
diff --git a/net-im/gnomeicu/Manifest b/net-im/gnomeicu/Manifest
new file mode 100644
index 000000000000..8128e1ba0d53
--- /dev/null
+++ b/net-im/gnomeicu/Manifest
@@ -0,0 +1,6 @@
+MD5 565f987fe2afd8f7a305998cc4172341 ChangeLog 4135
+MD5 bd3f7b2ef67615cf5befcd4b20f5869d gnomeicu-0.98.111-r1.ebuild 1177
+MD5 f5befaa99cbf607f888f95c9c15559f2 gnomeicu-0.99-r1.ebuild 1078
+MD5 8eb07033b5df670698aa800e66b5b803 files/digest-gnomeicu-0.98.111-r1 71
+MD5 b5fad07742b07e52b0f4397618cc7421 files/userserver.patch 11923
+MD5 705333559eedf05e858bc1e0232cca5f files/digest-gnomeicu-0.99-r1 67
diff --git a/net-im/gnomeicu/files/digest-gnomeicu-0.98.111 b/net-im/gnomeicu/files/digest-gnomeicu-0.98.111
deleted file mode 100644
index 1124d1d5565f..000000000000
--- a/net-im/gnomeicu/files/digest-gnomeicu-0.98.111
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57f2295e28febcc6215970924312d4d2 gnomeicu-0.98.111.tar.bz2 1007066
diff --git a/net-im/gnomeicu/files/digest-gnomeicu-0.98.126 b/net-im/gnomeicu/files/digest-gnomeicu-0.98.126
deleted file mode 100644
index 8e2a92d224bb..000000000000
--- a/net-im/gnomeicu/files/digest-gnomeicu-0.98.126
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a63a66601444a175a923f888fd92e08b gnomeicu-0.98.126.tar.bz2 1144644
diff --git a/net-im/gnomeicu/files/digest-gnomeicu-0.98.2-r5 b/net-im/gnomeicu/files/digest-gnomeicu-0.98.2-r5
deleted file mode 100644
index 379a2569a466..000000000000
--- a/net-im/gnomeicu/files/digest-gnomeicu-0.98.2-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0e015d060e3656c51b9dc962ed2a791 gnomeicu-0.98.2.tar.gz 1348190
diff --git a/net-im/gnomeicu/files/digest-gnomeicu-0.98.3 b/net-im/gnomeicu/files/digest-gnomeicu-0.98.3
deleted file mode 100644
index 2b7cb72b33ee..000000000000
--- a/net-im/gnomeicu/files/digest-gnomeicu-0.98.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a11f615c4de3640c5e56499f7b42f8e gnomeicu-0.98.3.tar.bz2 970685
diff --git a/net-im/gnomeicu/files/digest-gnomeicu-0.99 b/net-im/gnomeicu/files/digest-gnomeicu-0.99
deleted file mode 100644
index 99214f8d6b89..000000000000
--- a/net-im/gnomeicu/files/digest-gnomeicu-0.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5e49557a3ed3545b98c3749257e58ef gnomeicu-0.99.tar.bz2 1368468
diff --git a/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild b/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild
index adee4e5796c1..a85770d454d4 100644
--- a/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild
+++ b/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild,v 1.3 2003/02/13 14:08:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild,v 1.4 2003/05/09 22:42:31 liquidx Exp $
 
 
 inherit debug
@@ -20,7 +20,7 @@ DEPEND=">=x11-libs/gtk+-2.0.5
 	>=gnome-base/libgnomeui-2.0.0
 	>=sys-libs/gdbm-1.8.0
 	>=gnome-base/libglade-2.0.0	
-	>=net-libs/gnet-1.1.3
+	<net-libs/gnet-2
 	>=gnome-base/gnome-panel-2.0.0"
 RDEPEND="sys-devel/gettext"
 
diff --git a/net-im/gnomeicu/gnomeicu-0.98.111.ebuild b/net-im/gnomeicu/gnomeicu-0.98.111.ebuild
deleted file mode 100644
index 45a1eeee7c5d..000000000000
--- a/net-im/gnomeicu/gnomeicu-0.98.111.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.111.ebuild,v 1.3 2003/02/13 14:08:44 vapier Exp $
-
-IUSE="nls esd gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome ICQ Client"
-SRC_URI="mirror://sourceforge/gnomeicu/${P}.tar.bz2"
-HOMEPAGE="http://gnomeicu.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86" 
-
-DEPEND=">=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.23
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=sys-libs/gdbm-1.8.0
-	>=gnome-base/libglade-2.0.0	
-	>=net-libs/gnet-1.1.3
-	gnome? ( >=gnome-base/gnome-panel-2.0.0 )
-	esd? ( >=media-sound/esound-0.2.28 )"
-
-	# socks5? ( something to support socks5 in portage is needed )
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-
-src_compile() {                           
-	local myconf
-
-	myconf="--prefix=/usr"
-
-	use esd || myconf="${myconf} --disable-esd-test"
-	
-	# Disabling socks5 support. if socks5 is present
-	# in USE, gnomeicu buid will fail. Check ChangeLog
-	# for more info about this issue. stroke@gentoo.org 
-	# use socks5 && myconf="${myconf} --enable-socks5"
-	
-	use nls || ( \
-		myconf="${myconf} --disable-nls"
-		mkdir ./intl
-		touch ./intl/libgettext.h
-	)
-
-	# remove the panel applet if you dont use gnome,
-	# nice hack for gnome2 compability
-
-	use gnome || myconf="${myconf} --disable-applet" 	
-
-	econf \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/log	\
-	     install || die
-
-	dodoc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO ABOUT-NLS
-}
diff --git a/net-im/gnomeicu/gnomeicu-0.98.126.ebuild b/net-im/gnomeicu/gnomeicu-0.98.126.ebuild
deleted file mode 100644
index b489eb8bb540..000000000000
--- a/net-im/gnomeicu/gnomeicu-0.98.126.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.126.ebuild,v 1.4 2003/03/11 18:42:05 spider Exp $
-
-inherit gnome2 
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome ICQ Client"
-SRC_URI="mirror://sourceforge/gnomeicu/${P}.tar.bz2"
-HOMEPAGE="http://gnomeicu.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc  ~ppc ~alpha" 
-
-DEPEND=">=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.23
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=sys-libs/gdbm-1.8.0
-	>=gnome-base/libglade-2.0.0	
-	>=net-libs/gnet-1.1.4
-	>=gnome-base/gnome-panel-2.0.0
-	>=app-text/scrollkeeper-0.3.5
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22"
-	
-RDEPEND="sys-devel/gettext"
-
-DOCS="AUTHORS COPYING CREDITS ChangeLog README ABOUT-NLS"
-
-
diff --git a/net-im/gnomeicu/gnomeicu-0.98.2-r5.ebuild b/net-im/gnomeicu/gnomeicu-0.98.2-r5.ebuild
deleted file mode 100644
index ca026192f9f0..000000000000
--- a/net-im/gnomeicu/gnomeicu-0.98.2-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.2-r5.ebuild,v 1.5 2003/02/13 14:08:56 vapier Exp $
-
-IUSE="nls esd gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome ICQ Client"
-SRC_URI="mirror://sourceforge/gnomeicu/${P}.tar.bz2"
-HOMEPAGE="http://gnomeicu.sourceforge.net/"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r2
-	>=sys-libs/gdbm-1.8.0
-	=gnome-base/libglade-0.17*
-	>=media-libs/gdk-pixbuf-0.9.0	
-	>=net-libs/gnet-1.1.0
-	gnome? ( =gnome-base/gnome-panel-1.4* )
-	esd? ( >=media-sound/esound-0.2.23 )"
-
-	# socks5? ( something to support socks5 in portage is needed )
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-src_compile() {                           
-	local myconf
-
-	myconf="--prefix=/usr"
-
-	use esd || myconf="${myconf} --disable-esd-test"
-	
-	# Disabling socks5 support. if socks5 is present
-	# in USE, gnomeicu buid will fail. Check ChangeLog
-	# for more info about this issue. stroke@gentoo.org 
-	# use socks5 && myconf="${myconf} --enable-socks5"
-	
-	use nls || ( \
-		myconf="${myconf} --disable-nls"
-		mkdir ./intl
-		touch ./intl/libgettext.h
-	)
-
-	# remove the panel applet if you dont use gnome,
-	# nice hack for gnome2 compability
-
-	use gnome || myconf="${myconf} --disable-applet" 	
-
-	econf \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/log	\
-	     install || die
-
-	dodoc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO ABOUT-NLS
-}
diff --git a/net-im/gnomeicu/gnomeicu-0.98.3.ebuild b/net-im/gnomeicu/gnomeicu-0.98.3.ebuild
deleted file mode 100644
index c3c24a430570..000000000000
--- a/net-im/gnomeicu/gnomeicu-0.98.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.3.ebuild,v 1.6 2003/02/13 14:09:02 vapier Exp $
-
-IUSE="nls esd gnome"
-
-inherit debug 
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome ICQ Client"
-SRC_URI="mirror://sourceforge/gnomeicu/${P}.tar.bz2"
-HOMEPAGE="http://gnomeicu.sourceforge.net/"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r2
-	>=sys-libs/gdbm-1.8.0
-	=gnome-base/libglade-0.17*
-	>=media-libs/gdk-pixbuf-0.9.0	
-	>=net-libs/gnet-1.1.0
-	gnome? ( =gnome-base/gnome-panel-1.4* )
-	esd? ( >=media-sound/esound-0.2.23 )"
-
-	# socks5? ( something to support socks5 in portage is needed )
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-src_compile() {                           
-	local myconf
-
-	myconf="--prefix=/usr"
-
-	use esd || myconf="${myconf} --disable-esd-test"
-	
-	# Disabling socks5 support. if socks5 is present
-	# in USE, gnomeicu buid will fail. Check ChangeLog
-	# for more info about this issue. stroke@gentoo.org 
-	# use socks5 && myconf="${myconf} --enable-socks5"
-	
-	use nls || ( \
-		myconf="${myconf} --disable-nls"
-		mkdir ./intl
-		touch ./intl/libgettext.h
-	)
-
-	# remove the panel applet if you dont use gnome,
-	# nice hack for gnome2 compability
-
-	use gnome || myconf="${myconf} --disable-applet" 	
-
-	econf \
-		${myconf} --enable-debug || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/log	\
-	     install || die
-
-	dodoc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO ABOUT-NLS
-}
diff --git a/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild b/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild
index 62277a98233c..677373eb6205 100644
--- a/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild
+++ b/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild,v 1.2 2003/04/03 00:10:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild,v 1.3 2003/05/09 22:42:31 liquidx Exp $
 
 inherit gnome2 
 
@@ -19,7 +19,7 @@ DEPEND=">=x11-libs/gtk+-2.0.5
 	>=gnome-base/libgnomeui-2.0.0
 	>=sys-libs/gdbm-1.8.0
 	>=gnome-base/libglade-2.0.0	
-	>=net-libs/gnet-1.1.4
+	<net-libs/gnet-2
 	>=app-text/scrollkeeper-0.3.5
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.22
@@ -29,12 +29,7 @@ DEPEND=">=x11-libs/gtk+-2.0.5
 
 src_unpack () {
 	unpack ${A}
-	cd ${S}/doc/C
-	cp Makefile.in Makefile.in.old
-	sed -e "s:-scrollkeeper-update.*::g" \
-		Makefile.in.old > Makefile.in
-	rm Makefile.in.old
-	cd ${S}
+	cd ${S}/doc/C; sed -i -e 's:-scrollkeeper-update.*:-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir):' Makefile.in
 }
 
 DOCS="AUTHORS COPYING CREDITS ChangeLog README ABOUT-NLS"
diff --git a/net-im/gnomeicu/gnomeicu-0.99.ebuild b/net-im/gnomeicu/gnomeicu-0.99.ebuild
deleted file mode 100644
index 53592e35920d..000000000000
--- a/net-im/gnomeicu/gnomeicu-0.99.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.99.ebuild,v 1.1 2003/03/11 18:42:05 spider Exp $
-
-inherit gnome2 
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome ICQ Client"
-SRC_URI="mirror://sourceforge/gnomeicu/${P}.tar.bz2"
-HOMEPAGE="http://gnomeicu.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc  ~ppc ~alpha" 
-
-DEPEND=">=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.23
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=sys-libs/gdbm-1.8.0
-	>=gnome-base/libglade-2.0.0	
-	>=net-libs/gnet-1.1.4
-	>=gnome-base/gnome-panel-2.0.0
-	>=app-text/scrollkeeper-0.3.5
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22"
-	
-RDEPEND="sys-devel/gettext"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}/doc/C
-	cp Makefile.in Makefile.in.old
-	sed -e "s:-scrollkeeper-update.*::g" \
-		Makefile.in.old > Makefile.in
-	rm Makefile.in.old
-	cd ${S}
-}
-DOCS="AUTHORS COPYING CREDITS ChangeLog README ABOUT-NLS"
-
-