gentoo resync : 14.07.2018

8 files changed, 2 insertions, 342 deletions

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 82cf7b0177fd..deab42521460 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,13 +1,6 @@
-AUX sarg-2.3.10-bool.patch 228 BLAKE2B 38c1ca6c03c316afab832c2680afc433d499a9f0218c004996b4f74ef24395c57bd3e2355d1af0244b31d1a50f017faf96ca8e75e142884a3b2ab5ac66bbb7e6 SHA512 f5f5aa42a16e01fe84c4f62715215ed960323b1c2525281c1433e20bde08c1ed4c0a460b635905d2fd7a0269cff232446b557c30dc49b4652988f660b832f618
 AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda
-AUX sarg-2.3.10-format.patch 1541 BLAKE2B cfa03a3dad67f3ca8ec3b47db8755f5760b3780bedcb29549e04cecc955212003930e2a467749e964ab8073a404d55359826132e43ff6d1a01228a1a6fe79229 SHA512 d3c25d94da93dd1308b9c035fff3ddf6a241327596c182d85d79f183b659fa20ea8e806e5b1e3e8675dae843744b7329d03e572260c6932466694103180c8bd6
 AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4
 AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7
-AUX sarg-2.3.9-configure-bash.patch 4033 BLAKE2B 7f98a2fda63c4abe93ec80f5a068bdd99a647f811cb95c05f0a716167ca73b6ae4476b344cfe7f1d7d7b5e43e491790cbc8cb8aefc36bb0e0696cadb69a65350 SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68
-AUX sarg-2.3.9-configure.patch 641 BLAKE2B dc4162b7180bc40692e779ddf1d1a1b48442e9814c4d043593f695062f132041102ec70807aad07119b9415a9e04776d5728cd2e73a646e4c2dcb4351d4bf9a5 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae
-DIST sarg-2.3.10.tar.gz 1278071 BLAKE2B a9412069826328a7828cc3759858160a8e9121fee30697b8c54bc2e6ca948255f297147ff8692e3a62fe6c0a2b596a1a73e1090d03ef1fdacdd692866e6ef27d SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d
 DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
-EBUILD sarg-2.3.10-r1.ebuild 936 BLAKE2B f5e330e0c9b7e0a906c04c69e00676bce19a84d021186f3e99208a4bd2fd67895bc837191d0f774fd9488d547813b43e07a0ca8ff72eaadd46284e88bd92082f SHA512 c989ef3e90ae8d1e8852e50d08825efa7596e8c688332e38f648b716bda4cce1d6b35cf1cd249a84c0565284c0aafd9e57d1bfc7d4272219e33dea1156bb16a2
-EBUILD sarg-2.3.10.ebuild 1757 BLAKE2B 1e5d9122b9f9dc647971485eafc762155ed7cda0bcd24739a9b1d780d1c9e7f0880136e9ba0b88dc6e628dd2e2341414fa61f08aa92266b73530c5a3e40c391d SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182
-EBUILD sarg-2.3.11-r1.ebuild 850 BLAKE2B 5eaf073ba0951e283a2418a23c45d72bf2be1fb0a4dbec7e926f2931586c74489170e702d7ada29066543865521972ddd9b07a1a0ab17d43232cbfa4acf22d33 SHA512 e7dc21b45f3bd8227cc039b2a3b8e7a328073b26bd698d742fefde1ab309d6746f328fd831e5b8bb23e3ed5b7f0a5daf9c28f5f37b6015a8e00a7295c4c0c005
+EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973
 MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
deleted file mode 100644
index 188b6dd3732b..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util.c
-+++ b/util.c
-@@ -2088,7 +2088,7 @@
- 	int pad_len;
- 	bool bracket=false;
- 	bool port=false;
--	bool port_num=0;
-+	int port_num=0;
- 
- 	// skip leading spaces and tabs
- 	while (*buf && (*buf==' ' || *buf=='\t')) buf++;
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-format.patch b/net-analyzer/sarg/files/sarg-2.3.10-format.patch
deleted file mode 100644
index 926fdc8c6725..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-format.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/report.c
-+++ b/report.c
-@@ -54,7 +54,7 @@
- 	char accsmart[MAXLEN];
- 	char crc2[MAXLEN/2 -1];
- 	char siteind[MAX_TRUNCATED_URL];
--	char arqtt[256];
-+	char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10];
- 	char *oldurltt=NULL;
- 	char oldaccdiatt[11],oldacchoratt[9];
- 	char tmp3[MAXLEN];
---- a/util.c
-+++ b/util.c
-@@ -671,10 +671,10 @@
- char *buildtime(long long int elap)
- {
- 	int num = elap / 1000;
--	int hor = 0;
--	int min = 0;
--	int sec = 0;
--	static char buf[12];
-+	short int hor = 0;
-+	short int min = 0;
-+	short int sec = 0;
-+	static char buf[15];
- 
- 	buf[0]='\0';
- 
-@@ -1236,10 +1236,10 @@
- char *fixtime(long long int elap)
- {
- 	int num = elap / 1000;
--	int hor = 0;
--	int min = 0;
--	int sec = 0;
--	static char buf[12];
-+	short int hor = 0;
-+	short int min = 0;
-+	short int sec = 0;
-+	static char buf[15];
- 
- 	hor=num / 3600;
- 	min=(num % 3600) / 60;
-@@ -1248,7 +1248,7 @@
- 	if(hor==0 && min==0 && sec==0)
- 		strcpy(buf,"0");
- 	else
--		sprintf(buf,"%d:%02d:%02d",hor,min,sec);
-+		sprintf(buf,"%02d:%02d:%02d",hor,min,sec);
- 
- 	return buf;
- }
---- a/index.c
-+++ b/index.c
-@@ -89,9 +89,9 @@
- 	char monthdir[MAXLEN];
- 	char monthname1[9], monthname2[9];
- 	char nmonth[30];
--	char monthnum[10];
-+	char monthnum[15];
- 	char dayindex[MAXLEN];
--	char daynum[10];
-+	char daynum[15];
- 	char title[80];
- 	int yearsort[150];
- 	int nyears;
---- a/userinfo.c
-+++ b/userinfo.c
-@@ -67,7 +67,7 @@
- 	int skip;
- 	int flen;
- 	int count, clen;
--	char cstr[9];
-+	char cstr[10];
- 
- 	last=NULL;
- 	for (group=first_user_group ; group ; group=group->next) {
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
deleted file mode 100644
index ddc0ca8ec4eb..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.9-configure-bash.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -41,7 +41,7 @@
- CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"])
- AC_MSG_RESULT($have_extra_warnings)
--if test "$have_extra_warnings" == "no" ; then
-+if test "$have_extra_warnings" = "no" ; then
-     CFLAGS="${saved_CFLAGS}"
- fi
- 
-@@ -50,7 +50,7 @@
- CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
- AC_MSG_RESULT($have_implicit_function_declaration)
--if test "$have_implicit_function_declaration" == "no" ; then
-+if test "$have_implicit_function_declaration" = "no" ; then
-     CFLAGS="${saved_CFLAGS}"
- fi
- 
-@@ -59,7 +59,7 @@
- CFLAGS="${CFLAGS} -Werror=format"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
- AC_MSG_RESULT($have_error_format)
--if test "$have_error_format" == "no" ; then
-+if test "$have_error_format" = "no" ; then
-     CFLAGS="${saved_CFLAGS}"
- fi
- 
-@@ -93,7 +93,7 @@
- [],[with_gd=check])
- if ( test "x$with_gd" != "xno" ) ; then
- 	AC_CHECK_HEADERS(gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h)
--	if ( test "x$ac_cv_header_gd_h" == "xyes" ) ; then
-+	if ( test "x$ac_cv_header_gd_h" = "xyes" ) ; then
- 		AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD_LIB="yes", HAVE_GD_LIB="")
- 		if ( test "x$HAVE_GD_LIB" != "xyes" ) ; then
- 			AC_MSG_ERROR([ligbd is required to compile sarg with gd])
-@@ -137,7 +137,7 @@
- [],[with_pcre=check])
- if ( test "x$with_pcre" != "xno" ) ; then
- 	AC_CHECK_HEADERS(pcre.h)
--	if ( test "x$ac_cv_header_pcre_h" == "xyes" ) ; then
-+	if ( test "x$ac_cv_header_pcre_h" = "xyes" ) ; then
- 		LIBS="$LIBS $(pcre-config --libs)"
- 		CFLAGS="$CFLAGS $(pcre-config --cflags)"
- 	else
-@@ -243,7 +243,7 @@
-     fi
- ],[FONTDIR="${datarootdir}/sarg/fonts"])
- if test "$FONTDIR" ; then
--   if test "x$prefix" == "xNONE" ; then
-+   if test "x$prefix" = "xNONE" ; then
-       tempfullpath=`prefix=$ac_default_prefix ; eval "echo $FONTDIR"`
-    else
-       tempfullpath=`eval "echo $FONTDIR"`
-@@ -261,7 +261,7 @@
-         IMAGEDIR=$enableval
-     fi
- ],[IMAGEDIR="${datarootdir}/sarg/images"])
--if test "x$prefix" == "xNONE" ; then
-+if test "x$prefix" = "xNONE" ; then
-    tempfullpath=`prefix=$ac_default_prefix ; eval "echo $IMAGEDIR"`
- else
-    tempfullpath=`eval "echo $IMAGEDIR"`
-@@ -286,7 +286,7 @@
-        CFLAGS="${CFLAGS} -Wformat -Werror=format-security"
-        AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_format_security="yes"],[have_format_security="no"])
-        AC_MSG_RESULT($have_format_security)
--       if test "$have_format_security" == "no" ; then
-+       if test "$have_format_security" = "no" ; then
-           CFLAGS="${saved_CFLAGS}"
-        fi
- 
-@@ -295,7 +295,7 @@
-        CFLAGS="${CFLAGS} -Wempty-body"
-        AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_empty_body="yes"],[have_empty_body="no"])
-        AC_MSG_RESULT($have_empty_body)
--       if test "$have_empty_body" == "no" ; then
-+       if test "$have_empty_body" = "no" ; then
-           CFLAGS="${saved_CFLAGS}"
-        fi
-     fi
-@@ -367,14 +367,14 @@
- AC_CONFIG_FILES([Makefile po/Makefile.in])
- AC_OUTPUT
- 
--if ( test "x$gd_status" == "xdisabled" ) ; then
-+if ( test "x$gd_status" = "xdisabled" ) ; then
- 	AC_MSG_NOTICE([Not building with gd as requested on the configuration command line])
--elif ( test "x$gd_status" == "xnot found" ) ; then
-+elif ( test "x$gd_status" = "xnot found" ) ; then
- 	AC_MSG_NOTICE([gd.h was not found so the graphs won't be available in the report])
- fi
- 
--if ( test "x$pcre_status" == "xdisabled" ) ; then
-+if ( test "x$pcre_status" = "xdisabled" ) ; then
- 	AC_MSG_NOTICE([Not building with pcre as requested on the configuration command line])
--elif ( test "x$pcre_status" == "xnot found" ) ; then
-+elif ( test "x$pcre_status" = "xnot found" ) ; then
- 	AC_MSG_NOTICE([pcre.h was not found so the regexp won't be available in the hostalias])
- fi
diff --git a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch b/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
deleted file mode 100644
index 630e944f7534..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.9-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -2,6 +2,7 @@
- AC_INIT([sarg],[2.3.9])
- AC_CONFIG_SRCDIR([log.c])
- AC_CONFIG_AUX_DIR(cfgaux)
-+AC_CONFIG_MACRO_DIR(m4)
- 
- AC_CANONICAL_HOST
- 
-@@ -26,6 +27,11 @@
- dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
- AC_PROG_CC_C99
- 
-+dnl mkdir_p / MKDIR_P
-+AC_PROG_MKDIR_P
-+mkdir_p="$MKDIR_P"
-+AC_SUBST(mkdir_p)
-+
- # Report more warnings to improve code quality.
- CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
- 
-@@ -60,7 +66,7 @@
- 
- case "$host" in
-    *-solaris*)
--   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
-+   LIBS="${LIBS} -lsocket -lnsl"
-    CFLAGS="-DSOLARIS ${CFLAGS}"
-    ;;
- esac
diff --git a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
deleted file mode 100644
index 72e6e4dbb97f..000000000000
--- a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="+gd ldap pcre"
-
-DEPEND="
-	gd? ( media-libs/gd[png,truetype] )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.9-configure.patch
-	"${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
-	"${FILESDIR}"/${PN}-2.3.10-format.patch
-	"${FILESDIR}"/${PN}-2.3.10-bool.patch
-	"${FILESDIR}"/${PN}-2.3.10-config.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gd) \
-		$(use_with ldap) \
-		$(use_with pcre) \
-		--sysconfdir="${EPREFIX}/etc/sarg/"
-}
diff --git a/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild
deleted file mode 100644
index 870baa2e64d8..000000000000
--- a/net-analyzer/sarg/sarg-2.3.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE="+gd ldap pcre"
-
-DEPEND="
-	gd? ( media-libs/gd[png,truetype] )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.3.9-configure.patch \
-		"${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
-
-	sed -i \
-		-e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
-		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
-		-e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
-		-e 's:/usr/local/sarg/exclude_codes:/etc/sarg/exclude_codes:' \
-		sarg.conf || die
-
-	sed -i \
-		-e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
-		log.c || die #43132
-
-	sed	-i \
-		-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
-		htaccess || die
-
-	sed -i \
-		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
-		-e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
-		user_limit_block || die
-
-	sed -i \
-		-e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
-		sarg-php/sarg-block-it.php || die
-
-	sed -i \
-		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
-		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
-		sarg.1 sarg-php/sarg-squidguard-block.php || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gd) \
-		$(use_with ldap) \
-		$(use_with pcre) \
-		--sysconfdir="${EPREFIX}/etc/sarg/"
-}
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
index 10cc09c45d5e..88f7c507e91e 100644
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://sarg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE="+gd ldap pcre"