From a8eb7d7fa7bb9ceaec76cdb7c536434141160edf Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 12 Nov 2015 18:27:58 +0100 Subject: www-client/httrack: Remove older buggy releases Package-Manager: portage-2.2.24 --- www-client/httrack/Manifest | 1 - .../files/httrack-3.44.1+zlib-1.2.5.1.patch | 21 ------- .../httrack/files/httrack-3.45.4-cflags.patch | 12 ---- .../httrack/files/httrack-3.45.4-htmldir.patch | 35 ----------- .../files/httrack-3.45.4-install-once.patch | 32 ---------- .../httrack/files/httrack-3.45.4-parallel.patch | 68 ---------------------- .../httrack/files/httrack-3.46.1-parallel.patch | 48 --------------- .../files/httrack-3.47.2-ac-config-headers.patch | 24 -------- .../httrack/files/httrack-3.47.26-desktop.patch | 37 ------------ .../httrack/files/httrack-3.47.7-cflags.patch | 27 --------- .../httrack/files/httrack-3.47.7-warnings.patch | 41 ------------- www-client/httrack/httrack-3.45.4.ebuild | 45 -------------- www-client/httrack/httrack-3.48.21.ebuild | 37 ------------ 13 files changed, 428 deletions(-) delete mode 100644 www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch delete mode 100644 www-client/httrack/files/httrack-3.45.4-cflags.patch delete mode 100644 www-client/httrack/files/httrack-3.45.4-htmldir.patch delete mode 100644 www-client/httrack/files/httrack-3.45.4-install-once.patch delete mode 100644 www-client/httrack/files/httrack-3.45.4-parallel.patch delete mode 100644 www-client/httrack/files/httrack-3.46.1-parallel.patch delete mode 100644 www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch delete mode 100644 www-client/httrack/files/httrack-3.47.26-desktop.patch delete mode 100644 www-client/httrack/files/httrack-3.47.7-cflags.patch delete mode 100644 www-client/httrack/files/httrack-3.47.7-warnings.patch delete mode 100644 www-client/httrack/httrack-3.45.4.ebuild delete mode 100644 www-client/httrack/httrack-3.48.21.ebuild (limited to 'www-client/httrack') diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest index 169c8f63bf3..cd0882778ae 100644 --- a/www-client/httrack/Manifest +++ b/www-client/httrack/Manifest @@ -1,2 +1 @@ -DIST httrack-3.45.4.tar.gz 1699651 SHA256 715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4 SHA512 39494adb30d04fd891ea0006d5f776501a03d2dda5c9d8470ee8b680550de753125546d196576b7fa9a9918358cf0c554facee60db3765c2de6e80cc0d9daf7b WHIRLPOOL 58de8ffa48a7ef3826ca880f8073f3b404c540237f13013a316bb5b0de3eaf18c50dc10dded3b968172f18f914f88c962e4f23b41d055ce0c23025b4191533c7 DIST httrack-3.48.21.tar.gz 1805754 SHA256 871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246 WHIRLPOOL 3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252 diff --git a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch deleted file mode 100644 index cadaa8c0a17..00000000000 --- a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- httrack-3.44.1/src/minizip/ioapi.h -+++ httrack-3.44.1/src/minizip/ioapi.h -@@ -9,6 +9,7 @@ - #ifndef _ZLIBIOAPI_H - #define _ZLIBIOAPI_H - -+#define OF(x) x - - #define ZLIB_FILEFUNC_SEEK_CUR (1) - #define ZLIB_FILEFUNC_SEEK_END (2) ---- httrack-3.44.1/src/minizip/zip.h -+++ httrack-3.44.1/src/minizip/zip.h -@@ -42,6 +42,8 @@ - ftp://ftp.pkware.com/probdesc.zip - */ - -+#define OF(x) x -+ - #ifndef _zip_H - #define _zip_H - diff --git a/www-client/httrack/files/httrack-3.45.4-cflags.patch b/www-client/httrack/files/httrack-3.45.4-cflags.patch deleted file mode 100644 index a84c499f9d8..00000000000 --- a/www-client/httrack/files/httrack-3.45.4-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- /configure.in 2012-07-10 20:19:09.958552772 +0200 -+++ /configure.in 2012-07-10 20:19:39.011189564 +0200 -@@ -13,8 +13,7 @@ - AC_PROG_LN_S - - ### Default CFLAGS --DEFAULT_CFLAGS="" --DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \ -+DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \ - -Wnested-externs -D_REENTRANT" - AC_SUBST(DEFAULT_CFLAGS) diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch b/www-client/httrack/files/httrack-3.45.4-htmldir.patch deleted file mode 100644 index d13fe14ddc6..00000000000 --- a/www-client/httrack/files/httrack-3.45.4-htmldir.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- html/Makefile.am 2012-07-10 19:54:41.844906721 +0200 -+++ html/Makefile.am 2012-07-10 19:54:47.885831199 +0200 -@@ -1,13 +1,13 @@ - --HelpHtmlrootdir = $(datadir)/doc/httrack --HelpHtmldir = $(datadir)/doc/httrack/html --HelpHtmlimgdir = $(datadir)/doc/httrack/html/img --HelpHtmldivdir = $(datadir)/doc/httrack/html/div --HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images --HelpHtmlTxtdir = $(datadir)/doc/httrack/html --WebHtmldir = $(datadir)/doc/httrack/html/server --WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images --WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx -+HelpHtmlrootdir = $(docdir) -+HelpHtmldir = $(htmldir) -+HelpHtmlimgdir = $(HelpHtmldir)/img -+HelpHtmldivdir = $(HelpHtmldir)/div -+HelpHtmlimagesdir = $(HelpHtmldir)/images -+HelpHtmlTxtdir = $(HelpHtmldir) -+WebHtmldir = $(HelpHtmldir)/server -+WebHtmlimagesdir = $(HelpHtmldir)/server/images -+WebHtmlsfxdir = $(HelpHtmldir)/server/sfx - WebPixmapdir = $(datadir)/pixmaps - WebGPixmapdir = $(datadir)/httrack/icons - VFolderEntrydir = $(prefix)/share/applications -@@ -36,8 +36,6 @@ - install-data-hook: - if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \ - ( cd $(DESTDIR)$(prefix)/share/httrack \ -- && mv -f ../doc/httrack/html html \ -- && cd ../doc/httrack/ \ -- && $(LN_S) ../../httrack/html html \ -+ && $(LN_S) $(htmldir) html \ - ) \ - fi diff --git a/www-client/httrack/files/httrack-3.45.4-install-once.patch b/www-client/httrack/files/httrack-3.45.4-install-once.patch deleted file mode 100644 index 0590db59a9e..00000000000 --- a/www-client/httrack/files/httrack-3.45.4-install-once.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1022a4f21ef2c4c7dc671261aa24e33d8e1223e0 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Fri, 22 Jun 2012 22:38:21 +0200 -Subject: [PATCH] Make sure that files example.{c,h} are matched once -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise "make install" dies with this error: - -/usr/bin/install: will not overwrite just-created ‘[..]/example.c’ with ‘example.c’ -/usr/bin/install: will not overwrite just-created ‘[..]/example.h’ with ‘example.h’ -make[2]: *** [install-exemplesDATA] Error 1 ---- - libtest/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libtest/Makefile.am b/libtest/Makefile.am -index 7e90ba0..4be2158 100644 ---- a/libtest/Makefile.am -+++ b/libtest/Makefile.am -@@ -1,6 +1,6 @@ - - exemplesdir = $(datadir)/httrack/libtest --exemples_DATA = example.* *.c *.h *.txt -+exemples_DATA = *.c *.h *.txt - EXTRA_DIST = $(exemples_DATA) - - INCLUDES = \ --- -1.7.10.2 - diff --git a/www-client/httrack/files/httrack-3.45.4-parallel.patch b/www-client/httrack/files/httrack-3.45.4-parallel.patch deleted file mode 100644 index 72424639c41..00000000000 --- a/www-client/httrack/files/httrack-3.45.4-parallel.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -25,8 +25,8 @@ INCLUDES = \ - - bin_PROGRAMS = proxytrack httrack htsserver - --httrack_LDADD = $(THREADS_LIBS) -lhttrack --htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+httrack_LDADD = $(THREADS_LIBS) libhttrack.la -+htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la - proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) - proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT - -@@ -69,7 +69,7 @@ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS) - libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO) - - libhtsjava_la_SOURCES = htsjava.c htsjava.h --libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack -+libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la - libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO) - - EXTRA_DIST = httrack.h webhttrack \ ---- a/libtest/Makefile.am 2012-06-19 21:41:25.913281858 +0200 -+++ b/libtest/Makefile.am 2012-06-19 21:42:25.864532364 +0200 -@@ -18,33 +18,33 @@ - - # Examples - libbaselinks_la_SOURCES = callbacks-example-baselinks.c --libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libbaselinks_la_LDFLAGS = -version-info 1:0:0 - libchangecontent_la_SOURCES = callbacks-example-changecontent.c --libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libchangecontent_la_LDFLAGS = -version-info 1:0:0 - libcontentfilter_la_SOURCES = callbacks-example-contentfilter.c --libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libcontentfilter_la_LDFLAGS = -version-info 1:0:0 - libdisplayheader_la_SOURCES = callbacks-example-displayheader.c --libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libdisplayheader_la_LDFLAGS = -version-info 1:0:0 - libfilename2_la_SOURCES = callbacks-example-filename2.c --libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libfilename2_la_LDFLAGS = -version-info 1:0:0 - libfilename_la_SOURCES = callbacks-example-filename.c --libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libfilename_la_LDFLAGS = -version-info 1:0:0 - libfilenameiisbug_la_SOURCES = callbacks-example-filenameiisbug.c --libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0 - liblistlinks_la_SOURCES = callbacks-example-listlinks.c --liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - liblistlinks_la_LDFLAGS = -version-info 1:0:0 - liblog_la_SOURCES = callbacks-example-log.c --liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - liblog_la_LDFLAGS = -version-info 1:0:0 - libsimple_la_SOURCES = callbacks-example-simple.c --libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libsimple_la_LDFLAGS = -version-info 1:0:0 - pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la diff --git a/www-client/httrack/files/httrack-3.46.1-parallel.patch b/www-client/httrack/files/httrack-3.46.1-parallel.patch deleted file mode 100644 index 97623299bae..00000000000 --- a/www-client/httrack/files/httrack-3.46.1-parallel.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/libtest/Makefile.am b/libtest/Makefile.am -index d7c8309..4be2158 100644 ---- a/libtest/Makefile.am -+++ b/libtest/Makefile.am -@@ -18,33 +18,33 @@ AM_LDFLAGS = -L../src - - # Examples - libbaselinks_la_SOURCES = callbacks-example-baselinks.c --libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libbaselinks_la_LDFLAGS = -version-info 1:0:0 - libchangecontent_la_SOURCES = callbacks-example-changecontent.c --libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libchangecontent_la_LDFLAGS = -version-info 1:0:0 - libcontentfilter_la_SOURCES = callbacks-example-contentfilter.c --libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libcontentfilter_la_LDFLAGS = -version-info 1:0:0 - libdisplayheader_la_SOURCES = callbacks-example-displayheader.c --libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libdisplayheader_la_LDFLAGS = -version-info 1:0:0 - libfilename2_la_SOURCES = callbacks-example-filename2.c --libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libfilename2_la_LDFLAGS = -version-info 1:0:0 - libfilename_la_SOURCES = callbacks-example-filename.c --libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libfilename_la_LDFLAGS = -version-info 1:0:0 - libfilenameiisbug_la_SOURCES = callbacks-example-filenameiisbug.c --libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0 - liblistlinks_la_SOURCES = callbacks-example-listlinks.c --liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - liblistlinks_la_LDFLAGS = -version-info 1:0:0 - liblog_la_SOURCES = callbacks-example-log.c --liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - liblog_la_LDFLAGS = -version-info 1:0:0 - libsimple_la_SOURCES = callbacks-example-simple.c --libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack -+libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la - libsimple_la_LDFLAGS = -version-info 1:0:0 - pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la diff --git a/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch b/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch deleted file mode 100644 index 83b12cbff93..00000000000 --- a/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c56dfdd0f208a5a9413ad90f40c4a25ebb961598 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Thu, 25 Apr 2013 22:35:09 +0200 -Subject: [PATCH] Replace deprecated AM_CONFIG_HEADER by AC_CONFIG_HEADERS - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index e132eef..71b3458 100644 ---- a/configure.in -+++ b/configure.in -@@ -1,6 +1,6 @@ - AC_INIT(src/httrack.c) - AC_CONFIG_MACRO_DIR([m4]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE(httrack, 3.47.2) - VERSION_INFO="2:47:0" - AM_MAINTAINER_MODE --- -1.8.1.5 - diff --git a/www-client/httrack/files/httrack-3.47.26-desktop.patch b/www-client/httrack/files/httrack-3.47.26-desktop.patch deleted file mode 100644 index fd9174363fd..00000000000 --- a/www-client/httrack/files/httrack-3.47.26-desktop.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 48500945ca9717907189389d0a57e6df5f09a82c Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sun, 8 Sep 2013 22:34:13 +0200 -Subject: [PATCH] Fix .desktop files validation - ---- - html/server/div/WebHTTrack-Websites.desktop | 2 +- - html/server/div/WebHTTrack.desktop | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/html/server/div/WebHTTrack-Websites.desktop b/html/server/div/WebHTTrack-Websites.desktop -index 6efcab8..d36a4f9 100644 ---- a/html/server/div/WebHTTrack-Websites.desktop -+++ b/html/server/div/WebHTTrack-Websites.desktop -@@ -5,6 +5,6 @@ Categories=Network; - Terminal=false - Name=Browse Mirrored Websites - Comment=Browse Websites Mirrored by WebHTTrack --Keywords=browse mirrored -+Keywords=browse mirrored; - Exec=webhttrack browse - Icon=httrack -diff --git a/html/server/div/WebHTTrack.desktop b/html/server/div/WebHTTrack.desktop -index 984f4c7..28591f2 100644 ---- a/html/server/div/WebHTTrack.desktop -+++ b/html/server/div/WebHTTrack.desktop -@@ -5,6 +5,6 @@ Categories=Network; - Terminal=false - Name=WebHTTrack Website Copier - Comment=Copy websites to your computer --Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation -+Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation; - Exec=webhttrack - Icon=httrack --- -1.8.2.1 - diff --git a/www-client/httrack/files/httrack-3.47.7-cflags.patch b/www-client/httrack/files/httrack-3.47.7-cflags.patch deleted file mode 100644 index aa414b96402..00000000000 --- a/www-client/httrack/files/httrack-3.47.7-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f780de5a662deeea66df4dc9056ac642c447bbaf Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Fri, 3 May 2013 00:58:15 +0200 -Subject: [PATCH] Fix CFLAGS - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c956081..7ceeb39 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,9 +14,8 @@ AM_PROG_LIBTOOL - AC_PROG_LN_S - - ### Default CFLAGS --DEFAULT_CFLAGS="" --DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \ -+DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \ - -Wnested-externs -D_REENTRANT" - AC_SUBST(DEFAULT_CFLAGS) - --- -1.8.1.5 - diff --git a/www-client/httrack/files/httrack-3.47.7-warnings.patch b/www-client/httrack/files/httrack-3.47.7-warnings.patch deleted file mode 100644 index 9f6ba964800..00000000000 --- a/www-client/httrack/files/httrack-3.47.7-warnings.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 80d9d1b3003ff79ddee26e9fd09eb1b746b6bf5c Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 4 May 2013 00:14:32 +0200 -Subject: [PATCH] Fix GCC warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -httrack.c: In function ‘htsshow_loop’: -httrack.c:446:21: warning: the address of ‘tempo’ will always evaluate as ‘true’ -httrack.c:480:19: warning: the address of ‘s’ will always evaluate as ‘true’ -httrack.c:484:19: warning: the address of ‘s’ will always evaluate as ‘true’ ---- - src/httrack.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/httrack.h b/src/httrack.h -index 8b049a1..90ca9d5 100644 ---- a/src/httrack.h -+++ b/src/httrack.h -@@ -129,7 +129,7 @@ extern FILE* ioinfo; - } while(0) - #define strncatbuff(A, B, N) do { \ - assertf( (A) != NULL ); \ -- if ( ! (B) ) { assertf( 0 ); } \ -+ if ( (B) == NULL ) { assertf( 0 ); } \ - if (htsMemoryFastXfr) { \ - if (sizeof(A) != sizeof(char*)) { \ - (A)[sizeof(A) - 1] = '\0'; \ -@@ -158,7 +158,7 @@ extern FILE* ioinfo; - } while(0) - #define strcpybuff(A, B) do { \ - assertf( (A) != NULL ); \ -- if ( ! (B) ) { assertf( 0 ); } \ -+ if ( (B) == NULL ) { assertf( 0 ); } \ - if (htsMemoryFastXfr) { \ - if (sizeof(A) != sizeof(char*)) { \ - (A)[sizeof(A) - 1] = '\0'; \ --- -1.8.1.5 - diff --git a/www-client/httrack/httrack-3.45.4.ebuild b/www-client/httrack/httrack-3.45.4.ebuild deleted file mode 100644 index 8d289030bbc..00000000000 --- a/www-client/httrack/httrack-3.45.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -AT_M4DIR='m4' -inherit autotools eutils - -DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser" -HOMEPAGE="http://www.httrack.com/" -SRC_URI="http://download.httrack.com/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND=">=sys-libs/zlib-1.2.5.1-r1" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS README greetings.txt history.txt ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=421499 - epatch "${FILESDIR}"/${P}-parallel.patch - epatch "${FILESDIR}"/${P}-install-once.patch - - epatch "${FILESDIR}"/${P}-htmldir.patch - epatch "${FILESDIR}"/${P}-cflags.patch - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/www-client/httrack/httrack-3.48.21.ebuild b/www-client/httrack/httrack-3.48.21.ebuild deleted file mode 100644 index 3134384ed67..00000000000 --- a/www-client/httrack/httrack-3.48.21.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils - -DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser" -HOMEPAGE="http://www.httrack.com/" -SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND=">=sys-libs/zlib-1.2.5.1-r1 - dev-libs/openssl" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS README greetings.txt history.txt ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch -} - -src_configure() { - econf $(use_enable static-libs static) \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || die -} -- cgit v1.2.1