Added new revision of x11-plugins/wmnetload 1.3 with support for libdockapp 0.5. wmnetload-1.3 stable for x86. Wipe out old ebuilds. Closes #53605

11 files changed, 106 insertions, 93 deletions

diff --git a/x11-plugins/wmnetload/ChangeLog b/x11-plugins/wmnetload/ChangeLog
index 5118cd945be3..3dfda758452f 100644
--- a/x11-plugins/wmnetload/ChangeLog
+++ b/x11-plugins/wmnetload/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/wmnetload
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.14 2004/06/28 21:27:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/ChangeLog,v 1.15 2004/07/20 12:57:23 s4t4n Exp $
+
+  30 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmnetload-1.3-r1.ebuild:
+  Revision bump that adds patch to support libdockapp 0.5, closing #53605
+  wmnetload-1.3-r1.ebuild:
+  Change DEPEND to depend on version 0.4.0-r1 of libdockapp
+  Stable for x86...
+  wmnetload-1.0.ebuild, wmnetload-1.1.ebuild, wmnetload-1.2.ebuild:
+  Wipe out old ebuilds.
 
   28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmnetload-1.0.ebuild:
   glibc -> libc
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index 91ee43f5876d..31065bc7c5fb 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -1,9 +1,12 @@
 MD5 ddf9c0397a13bcf40f28f8d565de8f70 wmnetload-1.2.ebuild 676
+MD5 8b31a8bcd20d884d0c89d08a275a7d33 wmnetload-1.3-r1.ebuild 824
 MD5 7958c447281a8ea7495880d5df50d353 wmnetload-1.1.ebuild 673
-MD5 4b8031bd289a04898224298298f03666 wmnetload-1.3.ebuild 673
-MD5 b304b72daa501dca7988977b7d2012e5 ChangeLog 1847
+MD5 9844afdfdc3322919f4deb2f5af327a2 wmnetload-1.3.ebuild 692
+MD5 c58c82f2bbd0cde105cfe7a441dd6466 ChangeLog 2198
 MD5 b56dd8953a5894b671c94734b952539c wmnetload-1.0.ebuild 672
 MD5 a4e6b8fede98f4471909cda8b29bc02d metadata.xml 600
+MD5 8287f37c009e97ceef426da1acdc9965 files/digest-wmnetload-1.3-r1 65
+MD5 91c8ced226a5e46438cc17ca8e0eaa19 files/add_support_for_libdockapp_0.5.patch 2028
 MD5 5072b8cab571ec285e5e13423d0d22f8 files/digest-wmnetload-1.0 65
 MD5 8d4cdbf2b55d23e4dc93fce4009cce50 files/digest-wmnetload-1.1 65
 MD5 f6cc1a3ba6664e398ce5cbed598e60d2 files/digest-wmnetload-1.2 65
diff --git a/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch b/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch
new file mode 100644
index 000000000000..ba43f5f811ba
--- /dev/null
+++ b/x11-plugins/wmnetload/files/add_support_for_libdockapp_0.5.patch
@@ -0,0 +1,63 @@
+--- configure	2004-06-10 20:59:32.970436153 -0500
++++ configure	2004-06-10 20:38:51.655962203 -0500
+@@ -4627,9 +4627,9 @@
+ 
+ LDFLAGS_old="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $LIBRARY_SEARCH_PATH"
+-echo "$as_me:$LINENO: checking for DAInitialize in -ldockapp" >&5
+-echo $ECHO_N "checking for DAInitialize in -ldockapp... $ECHO_C" >&6
+-if test "${ac_cv_lib_dockapp_DAInitialize+set}" = set; then
++echo "$as_me:$LINENO: checking for DAOpenDisplay in -ldockapp" >&5
++echo $ECHO_N "checking for DAOpenDisplay in -ldockapp... $ECHO_C" >&6
++if test "${ac_cv_lib_dockapp_DAOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -4648,11 +4648,11 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char DAInitialize ();
++char DAOpenDisplay ();
+ int
+ main ()
+ {
+-DAInitialize ();
++DAOpenDisplay ();
+   ;
+   return 0;
+ }
+@@ -4669,19 +4669,19 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_dockapp_DAInitialize=yes
++  ac_cv_lib_dockapp_DAOpenDisplay=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dockapp_DAInitialize=no
++ac_cv_lib_dockapp_DAOpenDisplay=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dockapp_DAInitialize" >&5
+-echo "${ECHO_T}$ac_cv_lib_dockapp_DAInitialize" >&6
+-if test $ac_cv_lib_dockapp_DAInitialize = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_dockapp_DAOpenDisplay" >&5
++echo "${ECHO_T}$ac_cv_lib_dockapp_DAOpenDisplay" >&6
++if test $ac_cv_lib_dockapp_DAOpenDisplay = yes; then
+   yes=yes
+ else
+   no=no
+@@ -4689,7 +4689,7 @@
+ 
+ LDFLAGS="$LDFLAGS_old"
+ 
+-if test "x$ac_cv_lib_dockapp_DAInitialize" = xyes; then
++if test "x$ac_cv_lib_dockapp_DAOpenDisplay" = xyes; then
+ 
+ CPPFLAGS_old="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $HEADER_SEARCH_PATH $XCFLAGS"
diff --git a/x11-plugins/wmnetload/files/digest-wmnetload-1.0 b/x11-plugins/wmnetload/files/digest-wmnetload-1.0
deleted file mode 100644
index 797662217e67..000000000000
--- a/x11-plugins/wmnetload/files/digest-wmnetload-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edc771126a0f9782ef2277484b587f75 wmnetload-1.0.tar.bz2 66613
diff --git a/x11-plugins/wmnetload/files/digest-wmnetload-1.1 b/x11-plugins/wmnetload/files/digest-wmnetload-1.1
deleted file mode 100644
index 13470699bd59..000000000000
--- a/x11-plugins/wmnetload/files/digest-wmnetload-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9e13d26db98021ac555549743b83f40 wmnetload-1.1.tar.bz2 74738
diff --git a/x11-plugins/wmnetload/files/digest-wmnetload-1.2 b/x11-plugins/wmnetload/files/digest-wmnetload-1.2
deleted file mode 100644
index d9a2f02e0197..000000000000
--- a/x11-plugins/wmnetload/files/digest-wmnetload-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80477b00215795c66c57274569f87969 wmnetload-1.2.tar.gz 103015
diff --git a/x11-plugins/wmnetload/files/digest-wmnetload-1.3-r1 b/x11-plugins/wmnetload/files/digest-wmnetload-1.3-r1
new file mode 100644
index 000000000000..8b3bbc0aa299
--- /dev/null
+++ b/x11-plugins/wmnetload/files/digest-wmnetload-1.3-r1
@@ -0,0 +1 @@
+MD5 104f594c8b30d3a0895c03679e759997 wmnetload-1.3.tar.gz 105588
diff --git a/x11-plugins/wmnetload/wmnetload-1.0.ebuild b/x11-plugins/wmnetload/wmnetload-1.0.ebuild
deleted file mode 100644
index 0c04f73258e6..000000000000
--- a/x11-plugins/wmnetload/wmnetload-1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.0.ebuild,v 1.9 2004/07/15 01:00:53 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="Network interface monitor dockapp"
-HOMEPAGE="http://freshmeat.net/projects/wmnetload/"
-SRC_URI="ftp://truffula.com/pub/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc amd64"
-
-DEPEND="virtual/libc
-	virtual/x11
-	x11-libs/libdockapp"
-
-src_compile() {
-
-	econf || die "configure failed"
-
-	make || die "parallel make failed"
-
-}
-
-src_install() {
-
-	einstall || die "make install failed"
-
-	dodoc AUTHORS README
-
-}
diff --git a/x11-plugins/wmnetload/wmnetload-1.1.ebuild b/x11-plugins/wmnetload/wmnetload-1.1.ebuild
deleted file mode 100644
index 49d8f460b297..000000000000
--- a/x11-plugins/wmnetload/wmnetload-1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.1.ebuild,v 1.7 2004/07/15 01:00:53 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="Network interface monitor dockapp"
-HOMEPAGE="http://freshmeat.net/projects/wmnetload/"
-SRC_URI="ftp://truffula.com/pub/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-DEPEND="virtual/x11
-	x11-libs/libdockapp"
-
-src_compile() {
-
-	econf || die "configure failed"
-
-	emake || die "parallel make failed"
-
-}
-
-src_install() {
-
-	einstall || die "make install failed"
-
-	dodoc AUTHORS README NEWS TODO INSTALL COPYING
-
-}
diff --git a/x11-plugins/wmnetload/wmnetload-1.2.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r1.ebuild
index f551b3396920..c50bfb5d5a8a 100644
--- a/x11-plugins/wmnetload/wmnetload-1.2.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r1.ebuild
@@ -1,31 +1,39 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.2.ebuild,v 1.9 2004/06/24 23:15:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3-r1.ebuild,v 1.1 2004/07/20 12:57:23 s4t4n Exp $
+
+inherit eutils
 
 IUSE=""
+
 DESCRIPTION="Network interface monitor dockapp"
 HOMEPAGE="http://freshmeat.net/projects/wmnetload/"
 SRC_URI="ftp://truffula.com/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND="virtual/x11
-	x11-libs/libdockapp"
+	>=x11-libs/libdockapp-0.5.0"
 
-src_compile() {
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
 
-	econf || die "configure failed"
+	# Add support for libdockapp 0.5
+	epatch ${FILESDIR}/add_support_for_libdockapp_0.5.patch
+}
 
+src_compile()
+{
+	econf || die "configure failed"
 	emake || die "parallel make failed"
-
 }
 
-src_install() {
-
+src_install()
+{
 	einstall || die "make install failed"
-
-	dodoc AUTHORS README NEWS TODO INSTALL COPYING
-
+	dodoc AUTHORS README NEWS INSTALL COPYING
 }
diff --git a/x11-plugins/wmnetload/wmnetload-1.3.ebuild b/x11-plugins/wmnetload/wmnetload-1.3.ebuild
index 15e4a5b2e7a0..e70866c6bfbe 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3.ebuild,v 1.4 2004/06/24 23:15:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnetload/wmnetload-1.3.ebuild,v 1.5 2004/07/20 12:57:23 s4t4n Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -10,23 +12,19 @@ SRC_URI="ftp://truffula.com/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 
 DEPEND="virtual/x11
-	x11-libs/libdockapp"
-
-src_compile() {
+	=x11-libs/libdockapp-0.4.0-r1"
 
+src_compile()
+{
 	econf || die "configure failed"
-
 	emake || die "parallel make failed"
-
 }
 
-src_install() {
-
+src_install()
+{
 	einstall || die "make install failed"
-
 	dodoc AUTHORS README NEWS INSTALL COPYING
-
 }