bump to 0.10.2, bug #215139. fix compilation against app-antivirus/clamav-0.93, bug #221175.

Package-Manager: portage-2.1.5.4

5 files changed, 150 insertions, 2 deletions

diff --git a/www-misc/gurlchecker/ChangeLog b/www-misc/gurlchecker/ChangeLog
index 28c7df2d5b72..bbbb616e24cb 100644
--- a/www-misc/gurlchecker/ChangeLog
+++ b/www-misc/gurlchecker/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-misc/gurlchecker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/gurlchecker/ChangeLog,v 1.20 2008/03/28 02:03:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/gurlchecker/ChangeLog,v 1.21 2008/06/15 21:21:17 eva Exp $
+
+
+*gurlchecker-0.10.2 (15 Jun 2008)
+
+  15 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gurlchecker-0.10.2-clamav093.patch,
+  +files/gurlchecker-0.10.2-configure.in.patch, +gurlchecker-0.10.2.ebuild:
+  bump to 0.10.2, bug #215139.
+  fix compilation against app-antivirus/clamav-0.93, bug #221175.
 
   28 Mar 2008; Jeroen Roovers <jer@gentoo.org> gurlchecker-0.10.1.ebuild:
   Marked ~hppa too. Fixed quoting issues.
diff --git a/www-misc/gurlchecker/Manifest b/www-misc/gurlchecker/Manifest
index 862c5946a07a..894453e566bc 100644
--- a/www-misc/gurlchecker/Manifest
+++ b/www-misc/gurlchecker/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gurlchecker-0.10.1-ldflags.patch 1192 RMD160 070ce7a5af049c278e542fc6a6eb1ffa1efd82b0 SHA1 a6e1a6c8262ce39f5dfcea2e5dc57c14f168f63c SHA256 3f9d7392f713a01110649fe52412bea9ddfc5757fc5f7791af1c4fdecb0622e0
+AUX gurlchecker-0.10.2-clamav093.patch 554 RMD160 0f124dd9cbd72615e2aff75de8cefeee797176a3 SHA1 e66b70c0f9de19101695b7f66e0876696825ffa6 SHA256 5f553a3d5e76a44a29b5ed352b7837b192c8767efc55e9a90ae3c6329b48a787
+AUX gurlchecker-0.10.2-configure.in.patch 1684 RMD160 2e9b4a0123648cb968842e83d348f09bd6f90428 SHA1 0f6122744fee9f26e0eff3bb0e07394adc9cb02c SHA256 c308826817e64838bbc18f01a08a4b62a886e1f4ab1c2ff63dbd1e072217793f
 DIST gurlchecker-0.10.0.tar.gz 833719 RMD160 05c685c74fe93dd54763e8c397305b133625f6cc SHA1 72672eb685edc9c783b2d1ae77d7ff10e33e0dcd SHA256 3413b0bc4acf544a4794ad5c28d2fb4130f7ed86c6c44ecb0b89569c3bbaa320
 DIST gurlchecker-0.10.1.tar.gz 836777 RMD160 b6d58f773b2c679bf86ff1e0e34e18ddaa37569c SHA1 df395f59792eb15bc051f0e4e6d6cec42485fc9b SHA256 52ac0cc79659ca4101b0886977e6f0d0add4b301da82ce300247cfbe7befd6f2
+DIST gurlchecker-0.10.2.tar.gz 840629 RMD160 e1a55fbd26da29f17f010baf51480d09ce9b1570 SHA1 8a611045b2c3de26bf6b0a8d589c458deed3d3e5 SHA256 aaf5688cdc116467482be214751ba5a25be72c0b6b5f2a3fe825d8b9699f0650
 DIST gurlchecker-0.8.2.tar.gz 846290 RMD160 03ed023da6538752f3050ffd633d846b3dfd5d18 SHA1 d03d462923fca3bd2b033f257ef10e7d0d288b91 SHA256 22dce384873233da599f334a0947d64651556d6eec79af2557bbe93a2bf136c3
 EBUILD gurlchecker-0.10.0.ebuild 1302 RMD160 832d4dc338e8ac13704e37c07ef3f4f346a4396f SHA1 d24d03e3a904c687c6efb5294b8d82926a644e2e SHA256 ee9b9ac76e894a42adc4e1152191260faab45cb205e687005640e1dda8ceab6b
 EBUILD gurlchecker-0.10.1.ebuild 1420 RMD160 05a14f1dd0ef2e8c01a3bc7a0e0d5a5b8e50e806 SHA1 27877f1f26b97917b02af1db3f11896a35f611e6 SHA256 495bb2a8a940c7c11f490f32ed75de22f9c17311e8beecc4803ec082671930e0
+EBUILD gurlchecker-0.10.2.ebuild 1516 RMD160 c84f6b2eed6b79ba3d955fa9f6e22ecc99dedf5a SHA1 c9ac20348501d3de90982e898366826631976898 SHA256 0abf31d3dddebc7692081062b811ca6d371a87dc19e0db166ddfb946a054fbf6
 EBUILD gurlchecker-0.8.2.ebuild 1100 RMD160 477052d333bd73773a1cc7fec7d22c357848d537 SHA1 84ed2b2f3df14ebeecdf4dfd22bcd7d84ff55bf8 SHA256 61d98bed95c701db6e4574d021293e2b26e81b67f2a11754753c77b69f02de62
-MISC ChangeLog 5228 RMD160 5e29327bed18e3207a998ba6d201ff786c545683 SHA1 4b59fffab3e1cd8e7d6a59ecc8b76cd92e3ecf60 SHA256 6aeaca2b7e6b767c554191056c0d0a9d5e083527b706138d1b35ff38ecce7593
+MISC ChangeLog 5537 RMD160 7e458f36ab33e32de0f17c97ef56cf11cbe5af24 SHA1 59b24c03a44c5339a8996e3f04ce0864534608d1 SHA256 13bf0108f34b0ed190630d966cbc53094abb1f2c4e73382dcfb4ce732ceb4633
 MISC metadata.xml 475 RMD160 d8216a59f9c4bbf779d3efd3a6f9e0166ec29908 SHA1 522c9225fa359774169403ad7bc263a006af639e SHA256 250a41827df62165423b11e95ccd3d28cc0332f171f7ed67be890119a7225583
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhVh9MACgkQ1fmVwcYIWAZusACfTru9CNjN9MAe4z8dEubduyVF
+Hz0AnRQUqlz0uu5Ps4gyUMWb+4YdIteR
+=Gpmn
+-----END PGP SIGNATURE-----
diff --git a/www-misc/gurlchecker/files/gurlchecker-0.10.2-clamav093.patch b/www-misc/gurlchecker/files/gurlchecker-0.10.2-clamav093.patch
new file mode 100644
index 000000000000..8ef301999c2b
--- /dev/null
+++ b/www-misc/gurlchecker/files/gurlchecker-0.10.2-clamav093.patch
@@ -0,0 +1,13 @@
+--- var/tmp/portage/www-misc/gurlchecker-0.10.2/work/gurlchecker-0.10.2/src/ucclam.c 
++++ home/eva/Téléchargements/gurlchecker-scm-2008-06-15/src/ucclam.c 
+@@ -34,9 +34,8 @@
+   clam->limits.maxfiles = 1;
+   clam->limits.maxfilesize = 10 * 1048576;
+   clam->limits.maxreclevel = 1;
+-  clam->limits.maxratio = 200;
+   clam->limits.archivememlim = 0;
+-  if (cl_loaddbdir (cl_retdbdir (), &clam->root, &clam->no) ||
++  if (cl_load (cl_retdbdir (), &clam->root, &clam->no, CL_DB_STDOPT) ||
+       cl_build (clam->root))
+     {
+       uc_ucclam_free (clam);
diff --git a/www-misc/gurlchecker/files/gurlchecker-0.10.2-configure.in.patch b/www-misc/gurlchecker/files/gurlchecker-0.10.2-configure.in.patch
new file mode 100644
index 000000000000..5b4278dd2cc9
--- /dev/null
+++ b/www-misc/gurlchecker/files/gurlchecker-0.10.2-configure.in.patch
@@ -0,0 +1,55 @@
+# Autofoo of this package is just insane, need to rewrite it someday.
+--- configure.in.old	2008-06-15 21:27:45.000000000 +0200
++++ configure.in	2008-06-15 21:34:45.000000000 +0200
+@@ -120,7 +120,7 @@
+     [
+      want_croco=yes
+      CROCO_FLAGS="-DENABLE_CROCO $CROCO_CFLAGS"
+-     LDFLAGS="$LDFLAGS $want_croco_path"
++     #LDFLAGS="$LDFLAGS $want_croco_path"
+     ],
+     [
+      want_croco=no
+@@ -151,6 +151,7 @@
+     [
+      if test "x$withval" = "xno"; then
+        AC_MSG_RESULT([not requested])
++       want_tidy=no
+      elif test "x$withval" = "xyes" -o -d "$withval"; then
+        want_tidy=yes
+        want_tidy_path=$withval
+@@ -178,7 +179,7 @@
+ 	      have_tidy=yes
+ 	      TIDY_FLAGS="$TIDY_FLAGS -DHAVE_TIDY_H_IN_SUBDIR -DENABLE_TIDY"
+         TIDY_LIBS="-ltidy"
+-        LDFLAGS="$LDFLAGS $want_tidy_path"
++        #LDFLAGS="$LDFLAGS $want_tidy_path"
+ 	     ],
+        [have_tidy=no]
+ 	   )
+@@ -211,6 +212,7 @@
+     [
+      if test "x$withval" = "xno"; then
+        AC_MSG_RESULT([not requested])
++       want_clamav=no
+      elif test "x$withval" = "xyes" -o -d "$withval"; then
+        want_clamav=yes
+        want_clamav_path=$withval
+@@ -238,7 +240,7 @@
+ 	      have_clamav=yes
+ 	      CLAMAV_FLAGS="$CLAMAV_FLAGS -DENABLE_CLAMAV"
+         CLAMAV_LIBS="-lclamav"
+-        LDFLAGS="$LDFLAGS $want_clamav_path"
++        #LDFLAGS="$LDFLAGS $want_clamav_path"
+ 	     ],
+        [have_clamav=no]
+ 	   )
+@@ -298,7 +300,7 @@
+ 	      have_clamav=yes
+ 	      GNUTLS_FLAGS="$GNUTLS_FLAGS -DENABLE_GNUTLS"
+         GNUTLS_LIBS="-lgnutls"
+-        LDFLAGS="$LDFLAGS $want_gnutls_path"
++        #LDFLAGS="$LDFLAGS $want_gnutls_path"
+ 	     ],
+ 	     [
+ 	      have_clamav=yes
diff --git a/www-misc/gurlchecker/gurlchecker-0.10.2.ebuild b/www-misc/gurlchecker/gurlchecker-0.10.2.ebuild
new file mode 100644
index 000000000000..a8e1ed3d2c38
--- /dev/null
+++ b/www-misc/gurlchecker/gurlchecker-0.10.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/gurlchecker/gurlchecker-0.10.2.ebuild,v 1.1 2008/06/15 21:21:17 eva Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome tool that checks links on web pages/sites"
+HOMEPAGE="http://gurlchecker.labs.libre-entreprise.org/"
+SRC_URI="http://labs.libre-entreprise.org/frs/download.php/623/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+SLOT="0"
+IUSE="clamav doc gnutls tidy"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=dev-libs/libxml2-2.6
+	>=net-libs/gnet-2
+	>=dev-libs/libcroco-0.6
+	tidy? ( app-text/htmltidy )
+	clamav? ( app-antivirus/clamav )
+	gnutls? ( >=net-libs/gnutls-1 )"
+
+# docbook-sgml-utils used to build the man page
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.30
+	app-text/docbook-sgml-utils
+	doc? ( >dev-util/gtk-doc-1.1 )"
+
+DOCS="AUTHORS CONTRIBUTORS ChangeLog FAQ NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-croco
+		$(use_with tidy)
+		$(use_with clamav)
+		$(use_with gnutls)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# The file index.sgml should be distributed with the sources, but
+	# it is not, causing problems. See bug #92784.
+	touch "${S}"/doc/html/index.sgml
+
+	# Fix compilation with clamav 0.93, bug #
+	epatch "${FILESDIR}/${P}-clamav093.patch"
+
+	# Fix bad yes/no detection
+	epatch "${FILESDIR}/${P}-configure.in.patch"
+
+	eautoreconf
+}