Removed libwww dependency and added a patch to remove libmd5 instead

(Portage version: 2.2_rc13/cvs/Linux 2.6.28-rc4 x86_64)

4 files changed, 68 insertions, 6 deletions

diff --git a/xfce-extra/exo/ChangeLog b/xfce-extra/exo/ChangeLog
index 35f0dd51a1db..16c69ee19222 100644
--- a/xfce-extra/exo/ChangeLog
+++ b/xfce-extra/exo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/exo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.61 2008/11/10 17:19:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.62 2008/11/10 19:32:53 angelos Exp $
+
+  10 Nov 2008; Christoph Mende <angelos@gentoo.org>
+  +files/exo-0.3.4-remove-libmd5.patch, exo-0.3.4.ebuild,
+  exo-0.3.4-r1.ebuild:
+  Removed libwww dependency and added a patch to remove libmd5 instead
 
   10 Nov 2008; Christoph Mende <angelos@gentoo.org> exo-0.3.4.ebuild,
   exo-0.3.4-r1.ebuild:
diff --git a/xfce-extra/exo/exo-0.3.4-r1.ebuild b/xfce-extra/exo/exo-0.3.4-r1.ebuild
index ee352bb2c3eb..4b4ec2f434aa 100644
--- a/xfce-extra/exo/exo-0.3.4-r1.ebuild
+++ b/xfce-extra/exo/exo-0.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4-r1.ebuild,v 1.5 2008/11/10 17:19:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4-r1.ebuild,v 1.6 2008/11/10 19:32:53 angelos Exp $
 
 inherit eutils xfce44 python multilib
 
@@ -15,7 +15,6 @@ IUSE="debug doc hal libnotify python"
 RDEPEND=">=dev-lang/perl-5.6
 	dev-perl/URI
 	>=dev-libs/glib-2.6
-	net-libs/libwww
 	>=x11-libs/gtk+-2.6
 	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
 	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
@@ -41,6 +40,7 @@ src_unpack() {
 
 	sed -i -e 's:-Werror::g' "${S}"/configure
 	epatch "${FILESDIR}"/${P}-eject.patch
+	epatch "${FILESDIR}"/${P}-remove-libmd5.patch
 }
 
 # See bug 164780 for reference
diff --git a/xfce-extra/exo/exo-0.3.4.ebuild b/xfce-extra/exo/exo-0.3.4.ebuild
index 6e81a9654a64..8dc8161177ca 100644
--- a/xfce-extra/exo/exo-0.3.4.ebuild
+++ b/xfce-extra/exo/exo-0.3.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4.ebuild,v 1.11 2008/11/10 17:19:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.4.ebuild,v 1.12 2008/11/10 19:32:53 angelos Exp $
 
-inherit xfce44 python multilib
+inherit eutils xfce44 python multilib
 
 XFCE_VERSION=4.4.2
 xfce44
@@ -15,7 +15,6 @@ IUSE="debug doc hal libnotify python"
 RDEPEND=">=dev-lang/perl-5.6
 	dev-perl/URI
 	>=dev-libs/glib-2.6
-	net-libs/libwww
 	>=x11-libs/gtk+-2.6
 	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
 	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
@@ -38,6 +37,7 @@ DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
 src_unpack() {
 	unpack ${A}
 	sed -i -e 's:-Werror::g' "${S}"/configure
+	epatch "${FILESDIR}"/${P}-remove-libmd5.patch
 }
 
 # See bug 164780 for reference
diff --git a/xfce-extra/exo/files/exo-0.3.4-remove-libmd5.patch b/xfce-extra/exo/files/exo-0.3.4-remove-libmd5.patch
new file mode 100644
index 000000000000..a490820585d0
--- /dev/null
+++ b/xfce-extra/exo/files/exo-0.3.4-remove-libmd5.patch
@@ -0,0 +1,57 @@
+diff -u -ru exo-0.3.4.orig/configure.in exo-0.3.4/configure.in
+--- exo-0.3.4.orig/configure.in	2008-11-10 20:29:01.000000000 +0100
++++ exo-0.3.4/configure.in	2008-11-10 20:30:12.000000000 +0100
+@@ -106,7 +106,7 @@
+ dnl ***************************************
+ AC_HEADER_STDC()
+ AC_CHECK_HEADERS([assert.h errno.h fcntl.h fnmatch.h fstab.h libintl.h \
+-                  locale.h math.h md5.h md5global.h mmintrin.h mntent.h \
++                  locale.h math.h mmintrin.h mntent.h \
+                   paths.h regex.h signal.h stdarg.h string.h sys/mman.h \
+                   sys/mnttab.h sys/mount.h sys/param.h sys/resource.h \
+                   sys/statvfs.h sys/stat.h sys/time.h sys/types.h sys/ucred.h \
+@@ -118,12 +118,6 @@
+ AC_FUNC_MMAP()
+ AC_CHECK_FUNCS([getfsstat getmntent getvfsstat regexec setfsent setmntent])
+ 
+-dnl ******************************************
+-dnl *** Check for Message Digest functions ***
+-dnl ******************************************
+-AC_SEARCH_LIBS([MD5Init], [md md5 c], \
+-               [AC_DEFINE([HAVE_MD5INIT], [1], [Define if MD5Init present])])
+-
+ dnl ***************************************
+ dnl *** Check for strftime() extensions ***
+ dnl ***************************************
+diff -u -ru exo-0.3.4.orig/exo/exo-md5.c exo-0.3.4/exo/exo-md5.c
+--- exo-0.3.4.orig/exo/exo-md5.c	2008-11-10 20:29:01.000000000 +0100
++++ exo-0.3.4/exo/exo-md5.c	2008-11-10 20:29:40.000000000 +0100
+@@ -43,8 +43,6 @@
+ 
+ 
+ 
+-#if !defined(HAVE_MD5INIT) || !defined(HAVE_MD5_H)
+-
+ /*
+  * This code implements the MD5 message-digest algorithm.
+  * The algorithm is due to Ron Rivest. The original code was
+@@ -274,19 +272,6 @@
+   memcpy (digest, ctx->buf, 16);
+ }
+ 
+-#else
+-
+-/* RedHat AS, Fedora */
+-#ifdef HAVE_MD5GLOBAL_H
+-#include <md5global.h>
+-#endif
+-
+-#include <md5.h>
+-
+-#endif  /* !defined (HAVE_MD5INIT) */
+-
+-
+-
+ static void
+ get_md5 (const gchar *contents,
+          guchar       digest[16])