fix for bug #143545

(Portage version: 2.1.2_rc1)
 (Signed Manifest commit)

2 files changed, 18 insertions, 87 deletions

diff --git a/www-client/urlgfe/Manifest b/www-client/urlgfe/Manifest
index 08a98c311cd1..106bea4c7802 100644
--- a/www-client/urlgfe/Manifest
+++ b/www-client/urlgfe/Manifest
@@ -1,7 +1,6 @@
-AUX 1.0-as-needed.patch 3187 RMD160 117824375a9fc71682d71d09acabf568055eaea1 SHA1 383efec4c717afdbcbca48428c871c8fa731c71b SHA256 c019056577acbd6b25186a3b09a5f732b9d894f9dbd63309deb11f49c00df3d5
-MD5 40d0a1a066ec3e521a413619abd0b778 files/1.0-as-needed.patch 3187
-RMD160 117824375a9fc71682d71d09acabf568055eaea1 files/1.0-as-needed.patch 3187
-SHA256 c019056577acbd6b25186a3b09a5f732b9d894f9dbd63309deb11f49c00df3d5 files/1.0-as-needed.patch 3187
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST urlgfe-0.98a.tar.gz 573545 RMD160 e4fd399e32784ef21e615731b51298d641b684af SHA256 a80a1effb29b72a97e8e330eb67652db9bd9c55b9f9f1c51e7666a5f93e99322
 DIST urlgfe-0.98b.tar.gz 580344 RMD160 5437f0feb2489511b4b047a7dc6d479e0bc43e8c SHA256 e00e068ca63b4f6633dec5bdf917ce2fd92aaa2787d29afc6509f838b722adfd
 DIST urlgfe-1.0.tar.gz 554793 RMD160 ee6d9d852e205498decaedc8a355a720d52b735f SHA1 99d0bbbbb209489438d199686be4a27883dba4c5 SHA256 922fd0bdc1fc9a242fd297088c3bdbbd6b6f6a859e731392ddf6cf1d1cceec55
@@ -13,14 +12,14 @@ EBUILD urlgfe-0.98b.ebuild 794 RMD160 5ce95383875fc0bbd8ac8da91baa317e56c91086 S
 MD5 51d82bed0c2712adc1cc10a2ca00577b urlgfe-0.98b.ebuild 794
 RMD160 5ce95383875fc0bbd8ac8da91baa317e56c91086 urlgfe-0.98b.ebuild 794
 SHA256 d0dfd4ff407e47c976883e68500526957a3d8c34173a652edcd672cf490d56d8 urlgfe-0.98b.ebuild 794
-EBUILD urlgfe-1.0.ebuild 964 RMD160 ca1c529bd39e7f216241ef0cae74b24aa72a580d SHA1 394e3104e00ca1b91a71722a8c7553350affb30c SHA256 c793def5839f11f41086720ec88d0e2efe35dad6821ebb7118d7910fc5521096
-MD5 d6b883b767c17ff62dbbcd1ddfac5340 urlgfe-1.0.ebuild 964
-RMD160 ca1c529bd39e7f216241ef0cae74b24aa72a580d urlgfe-1.0.ebuild 964
-SHA256 c793def5839f11f41086720ec88d0e2efe35dad6821ebb7118d7910fc5521096 urlgfe-1.0.ebuild 964
-MISC ChangeLog 1790 RMD160 e04398788ee532f507f2f1d1365a70b7a97f5ca8 SHA1 82add62f5f597bdd0348afa977be05c2cfa49f48 SHA256 06ce17a8cd51dc7ceee89d26b16a45e82b3f3b0051c98fe37c5d52e87fa19312
-MD5 674ae92d89dfd20491e1d7627b4f7dbf ChangeLog 1790
-RMD160 e04398788ee532f507f2f1d1365a70b7a97f5ca8 ChangeLog 1790
-SHA256 06ce17a8cd51dc7ceee89d26b16a45e82b3f3b0051c98fe37c5d52e87fa19312 ChangeLog 1790
+EBUILD urlgfe-1.0.ebuild 813 RMD160 d24a34bc2881b306f48ac362f082a4f2574976de SHA1 0e963d24255565f5c4f4ea2f635bc4926cada3da SHA256 e9e5221a31455edf02f07336038ab200de7eac3b72d699893f09b3c7de508709
+MD5 ac376927e28e78f454c3d75f35e44fab urlgfe-1.0.ebuild 813
+RMD160 d24a34bc2881b306f48ac362f082a4f2574976de urlgfe-1.0.ebuild 813
+SHA256 e9e5221a31455edf02f07336038ab200de7eac3b72d699893f09b3c7de508709 urlgfe-1.0.ebuild 813
+MISC ChangeLog 1950 RMD160 d8bee5221f6c271752cbeca0f749cf94d8fae6c2 SHA1 9b9bf9f087af065bbd7afa0509e0c2815e90cae0 SHA256 cc5f8eac9fe6aaa20ca80ffbb21acf90ff2ad793b5e666de2f3ee40a37850259
+MD5 417fb0ca7d4bf9f1a7e812aedc62ecce ChangeLog 1950
+RMD160 d8bee5221f6c271752cbeca0f749cf94d8fae6c2 ChangeLog 1950
+SHA256 cc5f8eac9fe6aaa20ca80ffbb21acf90ff2ad793b5e666de2f3ee40a37850259 ChangeLog 1950
 MISC metadata.xml 533 RMD160 24c3956677a97103be91baca3ad43ec7e6a6a724 SHA1 3f03a271aad116e2cf367fd0ae1723b0259a8d3d SHA256 bbb5cbb41ecd378f20f0f6e6dda664b379a2df9485038039f3f99cdfa5396863
 MD5 02c76c4d6ee14a5634bba6f72032d3ce metadata.xml 533
 RMD160 24c3956677a97103be91baca3ad43ec7e6a6a724 metadata.xml 533
@@ -34,3 +33,10 @@ SHA256 08a1eba722a3e110bf4a20784cb69f37f514bce2cff420c8f67bc1b571893c0c files/di
 MD5 a6388e68c1af536d2f580cb75fd75c18 files/digest-urlgfe-1.0 232
 RMD160 2d4a6ab12139094ff4d4828edf3c061abc078222 files/digest-urlgfe-1.0 232
 SHA256 77f066c09dd78a3a481376fecb48db9d3ccd84c358c5366d9fd56f87909fc982 files/digest-urlgfe-1.0 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFQ9SmI1lqEGTUzyQRAsGBAJ4xU9RCdVL8MQeVjsaZvh+SxXkkEgCgmSfp
+Iqw++tNtb3UmpDb4qWI6x8s=
+=yUju
+-----END PGP SIGNATURE-----
diff --git a/www-client/urlgfe/files/1.0-as-needed.patch b/www-client/urlgfe/files/1.0-as-needed.patch
deleted file mode 100644
index 068c22540cd5..000000000000
--- a/www-client/urlgfe/files/1.0-as-needed.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Nur urlgfe-1.0.orig/configure.in urlgfe-1.0/configure.in
---- urlgfe-1.0.orig/configure.in	2006-07-07 03:39:42.000000000 +0000
-+++ urlgfe-1.0/configure.in	2006-08-02 22:13:27.557523459 +0000
-@@ -32,6 +32,33 @@
- dnl MKINSTALLDIRS="\$(top_srcdir)/install-sh -d"
- MKINSTALLDIRS="install-sh -d"
- 
-+PKG_CHECK_MODULES(GTK, gtk+-2.0)
-+PKG_CHECK_MODULES(GLIB, glib-2.0)
-+PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-+
-+AC_PATH_PROG(GETCONF, getconf)
-+if test "x$GETCONF" != "x" ; then
-+	LFS_CFLAGS=`$GETCONF LFS_CFLAGS`
-+	LFS_LDFLAGS=`$GETCONF LFS_LDFLAGS`
-+fi
-+AC_SUBST(LFS_CFLAGS LFS_LDFLAGS)
-+
-+AC_PATH_PROG(CURL_CONFIG, curl-config)
-+if test "x$CURL_CONFIG" = "x" ; then
-+	AC_MSG_ERROR(Unable to find curl-config, please install libcurl)
-+fi
-+CURL_CFLAGS=`$CURL_CONFIG --cflags`
-+CURL_LIBS=`$CURL_CONFIG --libs`
-+AC_SUBST(CURL_CFLAGS CURL_LIBS)
-+
-+AC_PATH_PROG(PCRE_CONFIG, pcre-config)
-+if test "x$PCRE_CONFIG" = "x" ; then
-+	AC_MSG_ERROR(Unable to find pcre-config, please install libpcre)
-+fi
-+PCRE_CFLAGS=`$PCRE_CONFIG --cflags`
-+PCRE_LIBS=`$PCRE_CONFIG --libs`
-+AC_SUBST(PCRE_CFLAGS PCRE_LIBS)
-+
- dnl Setup output files -----
- AC_OUTPUT(Makefile src/Makefile urlglib/Makefile pixmaps/Makefile po/Makefile.in intl/Makefile)
- 
-diff -Nur urlgfe-1.0.orig/src/Makefile.am urlgfe-1.0/src/Makefile.am
---- urlgfe-1.0.orig/src/Makefile.am	2006-07-07 03:29:45.000000000 +0000
-+++ urlgfe-1.0/src/Makefile.am	2006-08-02 22:06:16.942709543 +0000
-@@ -34,9 +34,8 @@
- bin_PROGRAMS = urlgfe
- 
- urlgfe_CPPFLAGS = -I$(top_srcdir) -DDATADIR=\"$(datadir)\"
--urlgfe_LDADD = ../urlglib/liburlglib.a
--urlgfe_CFLAGS = `pkg-config --cflags gtk+-2.0 gthread-2.0` `curl-config --cflags` `pcre-config --cflags`
--urlgfe_LDFLAGS = `pkg-config --libs gtk+-2.0 gthread-2.0` `curl-config --libs` `pcre-config --libs`
-+urlgfe_LDADD = ../urlglib/liburlglib.a @GTK_LIBS@ @GTHREAD_LIBS@ @CURL_LIBS@ @PCRE_LIBS@
-+urlgfe_CFLAGS = @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @CURL_CFLAGS@ @PCRE_CFLAGS@
- 
- urlgfe_SOURCES = urlgfe.c item_list_model.c node_list_model.c \
- 	category_tree_model.c category_tree_view.c download_list_view.c proxy_list_view.c \
-diff -Nur urlgfe-1.0.orig/urlglib/Makefile.am urlgfe-1.0/urlglib/Makefile.am
---- urlgfe-1.0.orig/urlglib/Makefile.am	2006-07-07 03:29:45.000000000 +0000
-+++ urlgfe-1.0/urlglib/Makefile.am	2006-08-02 22:06:16.946709828 +0000
-@@ -25,7 +25,7 @@
- 
- liburlglib_a_CPPFLAGS = -I$(top_srcdir)
- 
--liburlglib_a_CFLAGS = `getconf LFS_CFLAGS` `pkg-config --cflags glib-2.0 gthread-2.0` `curl-config --cflags` `pcre-config --cflags`
-+liburlglib_a_CFLAGS = @LFS_CFLAGS@ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ @CURL_CFLAGS@ @PCRE_CFLAGS@
- 
- 
- liburlglib_a_SOURCES = base_node.c urlglib_util.c \
-@@ -49,8 +49,8 @@
- noinst_PROGRAMS = test_urlglib
- 
- test_urlglib_CPPFLAGS = -I$(top_srcdir) -D_FILE_OFFSET_BITS=64
--test_urlglib_LDADD = liburlglib.a
-+test_urlglib_LDADD = liburlglib.a @GLIB_LIBS@ @GTHREAD_LIBS@ @CURL_LIBS@ @PCRE_LIBS@
- test_urlglib_CFLAGS =  $(liburlglib_a_CFLAGS) `getconf LFS_CFLAGS`
--test_urlglib_LDFLAGS = `getconf LFS_LDFLAGS` `pkg-config --libs glib-2.0 gthread-2.0` `curl-config --libs` `pcre-config --libs`
-+test_urlglib_LDFLAGS = @LFS_LDFLAGS@
- 
- test_urlglib_SOURCES = test_urlglib.c