diff options
| -rw-r--r-- | www-misc/gurlchecker/ChangeLog | 7 | ||||
| -rw-r--r-- | www-misc/gurlchecker/files/gurlchecker-0.10.2-configure.in.patch | 55 | ||||
| -rw-r--r-- | www-misc/gurlchecker/files/gurlchecker-0.10.5-gnutls28.patch | 43 | ||||
| -rw-r--r-- | www-misc/gurlchecker/gurlchecker-0.10.5.ebuild | 68 |
4 files changed, 6 insertions, 167 deletions
diff --git a/www-misc/gurlchecker/ChangeLog b/www-misc/gurlchecker/ChangeLog index bba06d5a522e..f8655a82bd62 100644 --- a/www-misc/gurlchecker/ChangeLog +++ b/www-misc/gurlchecker/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-misc/gurlchecker # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/gurlchecker/ChangeLog,v 1.39 2012/08/20 22:57:24 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/gurlchecker/ChangeLog,v 1.40 2012/08/22 13:49:56 kensington Exp $ + + 22 Aug 2012; Michael Palimaka <kensington@gentoo.org> + -files/gurlchecker-0.10.2-configure.in.patch, + -files/gurlchecker-0.10.5-gnutls28.patch, -gurlchecker-0.10.5.ebuild: + Remove old. 20 Aug 2012; Johannes Huber <johu@gentoo.org> gurlchecker-0.13.1.ebuild: Stable for x86, wrt bug #428828 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 deleted file mode 100644 index 8ec5a7589516..000000000000 --- a/www-misc/gurlchecker/files/gurlchecker-0.10.2-configure.in.patch +++ /dev/null @@ -1,55 +0,0 @@ -# Autofoo of this package is just insane, need to rewrite it someday. ---- a/configure.in 2008-06-15 21:27:45.000000000 +0200 -+++ b/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/files/gurlchecker-0.10.5-gnutls28.patch b/www-misc/gurlchecker/files/gurlchecker-0.10.5-gnutls28.patch deleted file mode 100644 index 91646a3a8f71..000000000000 --- a/www-misc/gurlchecker/files/gurlchecker-0.10.5-gnutls28.patch +++ /dev/null @@ -1,43 +0,0 @@ -# Fix gnutls detection in the same crazy way it was used before -# https://bugs.gentoo.org/show_bug.cgi?id=273980 ---- a/configure.in 2009-08-24 23:21:19.000000000 +0200 -+++ b/configure.in 2009-08-24 23:26:14.000000000 +0200 -@@ -290,29 +290,15 @@ - fi - if test "x$want_gnutls" != "xno"; then - AC_MSG_RESULT([requested]) -- AC_CHECK_LIB( -- [gnutls], -- [gnutls_global_init], -- [ -- AM_PATH_LIBGNUTLS( -- [1.0.0], -- [ -- want_gnutls=yes -- GNUTLS_FLAGS="$GNUTLS_FLAGS -DENABLE_GNUTLS" -- GNUTLS_LIBS="-lgnutls" -- #LDFLAGS="$LDFLAGS $want_gnutls_path" -- ], -- [ -- want_gnutls=yes -- AC_MSG_WARN([gurlchecker require libgnutls >= 1.0]) -- ] -- ) -- ], -- [ -- want_gnutls=yes -- AC_MSG_WARN([You requested GNUTLS support, but it doesn't seem to be installed.]) -- ] -- ) -+ PKG_CHECK_EXISTS([gnutls >= 1.0], [ -+ want_gnutls=yes -+ GNUTLS_FLAGS="$GNUTLS_FLAGS -DENABLE_GNUTLS" -+ GNUTLS_LIBS="-lgnutls" -+ #LDFLAGS="$LDFLAGS $want_gnutls_path" -+ ], [ -+ want_gnutls=yes -+ AC_MSG_WARN([You requested GNUTLS >= 1.0 support, but it doesn't seem to be installed.]) -+ ]) - else - AC_MSG_WARN([You are building without libgnutls support. gurlchecker will not be able to do HTTPS check...]) - fi diff --git a/www-misc/gurlchecker/gurlchecker-0.10.5.ebuild b/www-misc/gurlchecker/gurlchecker-0.10.5.ebuild deleted file mode 100644 index b990822f46fe..000000000000 --- a/www-misc/gurlchecker/gurlchecker-0.10.5.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/gurlchecker/gurlchecker-0.10.5.ebuild,v 1.8 2012/05/02 21:44:31 jdhore Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -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/737/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -SLOT="0" -IUSE="clamav doc gnutls tidy" - -RDEPEND=">=x11-libs/gtk+-2.6:2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libglade-2:2.0 - >=dev-libs/libxml2-2.6:2 - >=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} - virtual/pkgconfig - >=dev-util/intltool-0.30 - app-text/docbook-sgml-utils - dev-util/gtk-doc-am - 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_prepare() { - gnome2_src_prepare - - # 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 bad yes/no detection - epatch "${FILESDIR}/${PN}-0.10.2-configure.in.patch" - - # Fix tidy.h include dir for Gentoo: - epatch "${FILESDIR}/${PN}-0.10.5-autoconf-tidy.patch" - - # Fix gnutls detection, bug #273980 - epatch "${FILESDIR}/${PN}-0.10.5-gnutls28.patch" - - # Fix intltool test failure - echo "src/cookies.c" >> po/POTFILES.in - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} |