--- gurlchecker-0.10.1.ebuild	2008-03-28 06:23:58.000000000 +0100
+++ gurlchecker-0.10.2.ebuild	2008-03-28 06:25:30.000000000 +0100
@@ -6,19 +6,19 @@
 
 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/547/${P}.tar.gz"
+SRC_URI="http://labs.libre-entreprise.org/frs/download.php/623/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~hppa ~ppc ~x86"
 SLOT="0"
-IUSE="clamav doc gnutls tidy"
+IUSE="clamav croco 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
+	croco? ( >=dev-libs/libcroco-0.6 )
 	tidy? ( app-text/htmltidy )
 	clamav? ( app-antivirus/clamav )
 	gnutls? ( >=net-libs/gnutls-1 )"
@@ -33,19 +33,14 @@
 DOCS="AUTHORS CONTRIBUTORS ChangeLog FAQ NEWS README THANKS TODO"
 
 pkg_setup() {
-	G2CONF="--with-croco \
-		$(use_with tidy)   \
-		$(use_with clamav) \
-		$(use_with gnutls)"
+	G2CONF="$(use_enable croco) \
+		$(use_enable tidy)   \
+		$(use_enable clamav) \
+		$(use_enable gnutls)"
 }
 
 src_unpack() {
 	unpack ${A}
-
-	# Leave the LDFLAGS alone, appending $withval is utterly broken
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-
-	# 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
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }