diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index aa0ee442e2e8..7e8ee6c91530 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,2 +1 @@
DIST eclean-kernel-0.3.1.tar.bz2 8576 SHA256 c4e1dba9cd5d91f507f1a179256b88d2d93986703c8d022b354ed28be3c834de SHA512 9761fce8d34e6b98052e5d5bef45fb39b5f1d00272d696afbcf2ab1f6f44a247680eb415732708474417b8e2a970ea8ff9042792467e52bb8cd937efb07eca85 WHIRLPOOL d7694e7c82967b1e4ccf4b4a2f0baac38354a24cca980cfc48e89f155d6b5bfab5ad34f420864178693f80e6e1e93002cd71308679a578f144e4ea7a3fee75e1
-DIST eclean-kernel-0.3.tar.bz2 8555 SHA256 e3439e856c1be2958c45aedb1cb4ec680a50a769d62eb6f89c25a0c64fd92a26 SHA512 473d755db959b9c382b365fbe82b15e6fa953db6114ff2d33675f4a0cfda6786ced7436827ce6f094c81d145b315964beb1300326457d898b0ad8be4fbc4f655 WHIRLPOOL f6e86379eb6883d9b1052cdcc12bda60c15e803454179da01a2f7ef45aeb4fdf5363f57f393b98024cf00d48ac5eb17ce699dec74283035da2ae76bab427fd53
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.3.ebuild
deleted file mode 100644
index 8f03b1cbb916..000000000000
--- a/app-admin/eclean-kernel/eclean-kernel-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.3.ebuild,v 1.1 2012/05/11 17:35:25 mgorny Exp $
-
-EAPI=4
-
-PYTHON_COMPAT='python2_6 python2_7'
-inherit base python-distutils-ng
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://bitbucket.org/mgorny/eclean-kernel/"
-SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE=""
-
-PDEPEND="kernel_linux? ( dev-python/pymountboot )"
-
-python_prepare_all() {
- base_src_prepare
-}
-
-python_install_all() {
- dodoc README
-}
diff --git a/app-admin/eselect-sh/eselect-sh-0.3.ebuild b/app-admin/eselect-sh/eselect-sh-0.3.ebuild
index d7b11cd38c7e..45cb0d4eeeb2 100644
--- a/app-admin/eselect-sh/eselect-sh-0.3.ebuild
+++ b/app-admin/eselect-sh/eselect-sh-0.3.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-sh/eselect-sh-0.3.ebuild,v 1.10 2012/05/28 16:46:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-sh/eselect-sh-0.3.ebuild,v 1.11 2012/11/29 09:14:22 mgorny Exp $
EAPI=4
DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
-HOMEPAGE="https://github.com/mgorny/eselect-sh/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.gz"
+HOMEPAGE="https://bitbucket.org/mgorny/eselect-sh/"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/eselect-sh/metadata.xml b/app-admin/eselect-sh/metadata.xml
index f34c6c2716f1..5df778e83dc3 100644
--- a/app-admin/eselect-sh/metadata.xml
+++ b/app-admin/eselect-sh/metadata.xml
@@ -10,6 +10,6 @@
mgorny@gentoo.org
Michał Górny
- https://github.com/mgorny/eselect-sh/issues/
+ https://bitbucket.org/mgorny/eselect-sh/issues/
diff --git a/app-admin/salt/salt-0.10.0.ebuild b/app-admin/salt/salt-0.10.0.ebuild
index 03c9870a0fb0..1cfa72a1dee5 100644
--- a/app-admin/salt/salt-0.10.0.ebuild
+++ b/app-admin/salt/salt-0.10.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.0.ebuild,v 1.1 2012/07/06 23:16:24 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.0.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $
EAPI=4
@@ -31,6 +31,9 @@ RDEPEND="${DEPEND}
mysql? ( dev-python/mysql-python )
redis? ( dev-python/redis-py )"
+# Tests try to remove system files (bug #437268).
+RESTRICT=test
+
src_prepare() {
sed -i '/install_requires=/ d' setup.py || die "sed failed"
diff --git a/app-admin/salt/salt-0.10.5.ebuild b/app-admin/salt/salt-0.10.5.ebuild
index bde478f6a767..18d4d9088d0b 100644
--- a/app-admin/salt/salt-0.10.5.ebuild
+++ b/app-admin/salt/salt-0.10.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.5.ebuild,v 1.1 2012/11/16 18:25:06 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.5.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $
EAPI=4
@@ -33,6 +33,9 @@ RDEPEND="${DEPEND}
mysql? ( dev-python/mysql-python )
redis? ( dev-python/redis-py )"
+# Tests try to remove system files (bug #437268).
+RESTRICT=test
+
src_prepare() {
sed -i '/install_requires=/ d' setup.py || die "sed failed"
diff --git a/app-admin/salt/salt-0.9.8.ebuild b/app-admin/salt/salt-0.9.8.ebuild
index 3994ca4b9edb..7df20fc71499 100644
--- a/app-admin/salt/salt-0.9.8.ebuild
+++ b/app-admin/salt/salt-0.9.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.9.8.ebuild,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.9.8.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $
EAPI=4
@@ -31,6 +31,9 @@ RDEPEND="${DEPEND}
mysql? ( dev-python/mysql-python )
redis? ( dev-python/redis-py )"
+# Tests try to remove system files (bug #437268).
+RESTRICT=test
+
src_prepare() {
epatch "${FILESDIR}"/${P}-syndic-resolution-of-master.patch
sed -i '/install_requires=/ d' setup.py || die "sed failed"
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index a5cd573ccf19..101fa4e60a5a 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,7 +1,5 @@
-DIST geolizer_2.01-10-patch.20050520.tar.bz2 35836 SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378 SHA512 9bc011236ae5d28fae5ed50b99e74baa7de00fabf47ea26f2f111ac035c0c90921ba70dc1290170e4a29b6b6931dc849ed65b0d56d2d282c1cb84dc12447e1f8 WHIRLPOOL 14107f8c8ff74859c9dab9b10bd905cc12f899c7dd43cc7c844bb3609c0b6cc3e8e104aa30fea203c6d6fb849e72e699d6072c16399cffa505b2166919faf2dc
-DIST geolizer_2.01-10-patch.20070115.tar.gz 76862 SHA256 a619f863c9a65a06580080702e770251b8b4dc635e2ebf0fdb56a40b0f7eb1b3 SHA512 bf9434187d0d6b9889bd23d765dcfc2177d03179f692fa6c5994fa5ab4a6565415362eb7cfe6f0ac044e669be2075bef716f912dcec75f55adbace8be89738c4 WHIRLPOOL 82e3808f5bc232ba6681fc125cf3ce226ecaf6ebcc12b4ee83ebc2e3742c0214e9ddd5ab79ca21d0aa41fa9e09231775bf49ed3ef2be74751574d1ed46f82750
-DIST webalizer-2.01-10-RB17-patch.tar.gz 65343 SHA256 4cca8e09c51963caf0b498bc83d0a741ab097aed0b8c093bb69c31d6fa4f4d73 SHA512 f99bca9e406db43e02ef486df1cb963c1411049d5585a1b6ab2893b0bf255a09c50351ebf425e8da1aae6df4066c4f6359c2a584f56175be9ebd84773a9d600e WHIRLPOOL 9ba6cf33f48dfa9415bf199b78fdf00b076b4fd229338603405bfc23958c846b5ae34cf91d6fac293b717f1f492d344925b7e89a6ad36179ce3fa2775c6f6953
-DIST webalizer-2.01-10-RB21-patch.tar.gz 585340 SHA256 6ac3bfcba695e0c124ea3bc23581e0d7a14d2cda05caf47beb6b09bdfcf3541d SHA512 01d9975facbf284de6c80314cb89d3c5982e50745e89b2f1b9b7ade663e1ef6476f0973770f063d254c78874c67b332805afcadb8f47e5ab605c2fdba17c13f5 WHIRLPOOL 7b735d3880a0808b69d138762fc32b9f5ef3108168eba557da081229fc1f1df345aaebba21ac82583f898ad329fadbcdc9f36c83a4ce044a30bbadb7c1538403
-DIST webalizer-2.01-10-src.tar.bz2 252664 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 SHA512 5eb0c6344d99f92f8b2f72db533b61e7f79f18b94b1adbadc704f0a0b72998042d53daa1a2b8c92975be91ed25252f21ba99a1852365bccdc2338eb5041d6ff9 WHIRLPOOL ecae01667eb7ea163f8e2b66e9fc02f4fe57178eff067b24114633e1d7fc977097eb094b8ac2c2204ac4b7f72a8bc2cc68387b3a25d6a1653dc119acd7b5ccb1
DIST webalizer-2.21-02-src.tar.bz2 304926 SHA256 f2663d67f5820644a0b1c0b7dee4a5c764d829166fa28d5880442c28886729d9 SHA512 5bca43a36523d246d39338df22c25e554185863c54bc8a06018c1c20bf4292ad62ea122cb99b4a64fd72c43c9403e8e7119a3aac2898dba851c059dbda6a3780 WHIRLPOOL 9ed8131a8a4fa9706d2d5af23ff7b5f917aad4aa153b9967f6017f410fa83a02e2217f0f061b6c529498988ffc0a19476f6e0fbb73bc05630a4101f3d8526349
+DIST webalizer-2.23-05-RB29-patch.tar.gz 45853 SHA256 e212d1928315805b655bcb2614cf9e128373c80601ed6b7ee82ae6d050232a44 SHA512 967a5418e858adb5be8b64bac7edb52ac6eca8bce567269866f2ae7ac6e34c09d2d0ab1d7e7cfcbd92972cf5ea05ac2abaea2058e6fa9273e27cf10aacfb4759 WHIRLPOOL 2ac54d38f160e4311b240e00e6b33c0523341418a32190a3fdd2ba13a226fd53c986ea6d8e127f3444dec03c2801d984964f08141ee8e329e198dde520a6e76c
+DIST webalizer-2.23-05-src.tar.bz2 308238 SHA256 afc88b8ee0927d9ed004962cb7e3d3054ef7628c7bc8a7b2e3ea1d758a47885a SHA512 4840c2ba25e34d5e276c724c311d2c2d7a0223dcbf6dec567960f56bc4cdfe4f6a1e412e3fcab53395d6357377f4f8d2b3bcc4b23c46a3ec6a895813a681cd4b WHIRLPOOL 82e092ae6e21e3bd3f70cd53a2dc6b71ed3903f640d7e4d2aa5be81ad43cf8aea54f0dd1d3fc02f55a615b1b9208ec339ccadcfa342737e61ebb0404f7fddfe1
+DIST webalizer-geodb-latest.tgz 639447 SHA256 f2a1bd7fcc9c93ed6a627bd15f2c31866d5a6c6b7dd48852d84a129386327218 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117 WHIRLPOOL 26f1edf87ea6102c5047b41702fd273d40360bde7c481183a3303e2c89af3d6ba7470cd942d4af1574bed8822b776a26ea13c2388b7654fffccee856cc99e571
DIST webalizer.conf.gz 8986 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b WHIRLPOOL 58c2ced08eeba65e1c7acf951e2e0e1806af58fcd37997c4d824504235303d7f75cf6c05c7ce051e2e2f3b3abff9a929f0dfd7722a995a8ab65232cfb549e83a
diff --git a/app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch b/app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch
deleted file mode 100644
index 8cf07532bda2..000000000000
--- a/app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- webalizer-2.01-10/Makefile.in_BACKUP 2010-09-17 08:39:52.000000000 +0200
-+++ webalizer-2.01-10/Makefile.in 2010-09-17 08:40:02.000000000 +0200
-@@ -45,7 +45,6 @@
- output.o output.h graphs.o graphs.h lang.h \
- webalizer_lang.h
- $(CC) ${LDFLAGS} -o webalizer webalizer.o hashtab.o linklist.o preserve.o parser.o output.o dns_resolv.o graphs.o ${LIBS}
-- strip webalizer
- rm -f webazolver
- @LN_S@ webalizer webazolver
-
diff --git a/app-admin/webalizer/files/webalizer-db4.2.patch b/app-admin/webalizer/files/webalizer-db4.2.patch
deleted file mode 100644
index be792289108f..000000000000
--- a/app-admin/webalizer/files/webalizer-db4.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: webalizer-2.01-10/configure.in
-===================================================================
---- webalizer-2.01-10.orig/configure.in
-+++ webalizer-2.01-10/configure.in
-@@ -71,7 +71,7 @@ if test "$USE_DNS" = "yes"; then
- if test "$HAVE_DB" = ""; then
- AC_CHECK_FUNCS(dbopen)
- if test $ac_cv_func_dbopen = no; then
-- AC_SEARCH_LIBS(dbopen, db db1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes")
-+ OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes"; LIBS="-ldb ${LIBS}"
- if test "$HAVE_DB" = ""; then
- AC_MSG_WARN(You must have a V1.85 compatable DB library!)
- AC_MSG_WARN(DNS lookup code will be disabled...)
diff --git a/app-admin/webalizer/files/webalizer-storage-size.patch b/app-admin/webalizer/files/webalizer-storage-size.patch
deleted file mode 100644
index a6af0123bb19..000000000000
--- a/app-admin/webalizer/files/webalizer-storage-size.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: webalizer-2.01-10/webalizer.h
-===================================================================
---- webalizer-2.01-10.orig/webalizer.h
-+++ webalizer-2.01-10/webalizer.h
-@@ -17,10 +17,10 @@
- #define MAXURLH 128 /* Max URL field size in htab */
- #define MAXREF 1024 /* Max referrer field size */
- #define MAXREFH 128 /* Max referrer field size in htab */
--#define MAXAGENT 64 /* Max user agent field size */
-+#define MAXAGENT 128 /* Max user agent field size */
- #define MAXCTRY 48 /* Max country name size */
- #define MAXSRCH 256 /* Max size of search string buffer */
--#define MAXSRCHH 64 /* Max size of search str in htab */
-+#define MAXSRCHH 128 /* Max size of search str in htab */
- #define MAXIDENT 64 /* Max size of ident string (user) */
-
- #define SLOP_VAL 3600 /* out of sequence slop (seconds) */
diff --git a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
deleted file mode 100644
index 5c3e581e18f8..000000000000
--- a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.14 2010/10/28 03:35:18 sping Exp $
-
-EAPI="2"
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkill but works well
-inherit eutils webapp db-use autotools
-
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}"/${MY_P}
-XTENDED_VER="RB17"
-XTENDED_URL="rb17"
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${MY_P}-src.tar.bz2
- geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20050520.tar.bz2 )
- xtended? (
- http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
- mirror://gentoo/${PN}.conf.gz
-"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="apache2 geoip nls xtended"
-
-DEPEND=">=sys-libs/db-4.2
- >=sys-libs/zlib-1.1.4
- >=media-libs/libpng-1.2
- >=media-libs/gd-1.8.3[png]
- geoip? ( dev-libs/geoip )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # USE=nls has no real meaning if LINGUAS isn't set
- if use nls && [ -z "${LINGUAS}" ]; then
- ewarn "you must set LINGUAS in /etc/make.conf"
- ewarn "if you want to USE=nls"
- die "please either set LINGUAS or do not use nls"
- fi
-}
-
-src_prepare() {
- if use geoip; then
- epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \
- "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch
- use xtended && elog "Xtended doesn't work with geolizer, skipping"
- else
- epatch "${FILESDIR}"/${PN}-db4.2.patch || die
- if use xtended; then
- epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch || die
- fi
- fi
-
- # bug 121816: prevent truncated useragent fields
- sed -i -e 's:^#define MAXAGENT 64:#define MAXAGENT 128:' webalizer.h
-
- # stupid broken configuration file
- eautoreconf
-}
-
-src_configure() {
- local myconf=" --enable-dns \
- --with-db=$(db_includedir) \
- --with-dblib=$(db_libname)"
- use geoip && myconf="${myconf} --enable-geoip"
-
- # really dirty hack; necessary due to a really gross ./configure
- # basically, it just sets the natural language the program uses
- # unfortunatly, this program only allows for one lang, so only the first
- # entry in LINGUAS is used
- if use nls; then
- local longlang
- longlang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/webalizer-language-list.txt)"
- myconf="${myconf} --with-language=${longlang:3}"
- else
- myconf="${myconf} --with-language=english"
- fi
-
- econf ${myconf} || die "econf failed"
-}
-
-src_install() {
- webapp_src_preinst
-
- into /usr
- dobin webalizer
- dosym webalizer /usr/bin/webazolver
- doman webalizer.1
-
- insinto /etc
- doins "${WORKDIR}"/${PN}.conf
- use apache2 && sed -i -e "s/apache/apache2/g" "${D}"/etc/webalizer.conf
-
- dodoc *README* CHANGES Copyright sample.conf "${FILESDIR}"/apache.webalizer
- webapp_src_install
-}
-
-pkg_postinst(){
- elog
- elog "It is suggested that you restart apache before using webalizer"
- elog "You may want to review /etc/webalizer.conf and ensure that"
- elog "OutputDir is set correctly"
- elog
- elog "Then just type webalizer to generate your stats."
- elog "You can also use cron to generate them e.g. every day."
- elog "They can be accessed via http://localhost/webalizer"
- elog
- elog "A sample Apache config file has been installed into"
- elog "/usr/share/doc/${PF}/apache.webalizer"
- elog "Please edit and install it as necessary"
- elog
-
- if [ ${#LINGUAS} -gt 2 ] && use nls; then
- ewarn
- ewarn "You have more than one language in LINGUAS"
- ewarn "Due to the limitations of this packge, it was built"
- ewarn "only with ${LINGUAS:0:2} support. If this is not what"
- ewarn "you intended, please place the language you desire"
- ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
- ewarn
- fi
-
- if use xtended; then
- elog "Read http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/INSTALL"
- elog "if you are switching from stock webalizer to xtended"
- fi
-
- webapp_pkg_postinst
-}
diff --git a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
deleted file mode 100644
index 7e11ad4bb33c..000000000000
--- a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.6 2010/10/28 03:35:18 sping Exp $
-
-EAPI="2"
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkill but works well
-inherit confutils eutils webapp db-use autotools
-
-WEBAPP_MANUAL_SLOT="yes"
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-
-XTENDED_VER="RB21"
-XTENDED_URL="rb21"
-GEOLIZER_VER="20070115"
-
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${MY_P}-src.tar.bz2
- geoip? (
- http://sysd.org/stas/files/active/0/geolizer_${MY_PV}-patch.${GEOLIZER_VER}.tar.gz )
- xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
- mirror://gentoo/${PN}.conf.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="geoip nls xtended"
-SLOT="0"
-
-DEPEND=">=sys-libs/db-4.2
- >=sys-libs/zlib-1.1.4
- >=media-libs/libpng-1.2
- >=media-libs/gd-1.8.3
- geoip? ( dev-libs/geoip )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
- confutils_require_built_with_all media-libs/gd png
-
- # USE=nls has no real meaning if LINGUAS isn't set
- if use nls && [[ -z "${LINGUAS}" ]]; then
- ewarn "you must set LINGUAS in /etc/make.conf"
- ewarn "if you want to USE=nls"
- die "please either set LINGUAS or do not use nls"
- fi
-}
-
-src_prepare() {
- if use geoip && ! use xtended; then
- epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \
- "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch
- else
- epatch "${FILESDIR}"/${PN}-db4.2.patch
- if use xtended; then
- epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
- else
- epatch "${FILESDIR}"/${PN}-storage-size.patch
- fi
- fi
-
- eautoreconf
-}
-
-src_configure() {
- # really dirty hack; necessary due to a really gross ./configure
- # basically, it just sets the natural language the program uses
- # unfortunatly, this program only allows for one lang, so only the first
- # entry in LINGUAS is used
- if use nls; then
- local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
- local myconf="${myconf} --with-language=${longlang:3}"
- else
- local myconf="${myconf} --with-language=english"
- fi
-
- if use xtended && use geoip ; then
- # Rationale:
- # 1. --enable-geoip broken on geolizer
- # 2. --disable-geoip broken on webalizer xtended
- myconf="${myconf} --enable-geoip"
- fi
-
- econf --enable-dns \
- --with-db=$(db_includedir) \
- --with-dblib=$(db_libname) \
- ${myconf} \
- || die "econf failed"
-}
-
-src_install() {
- webapp_src_preinst
-
- dobin webalizer
- dosym webalizer /usr/bin/webazolver
- doman webalizer.1
-
- insinto /etc
- doins "${WORKDIR}"/${PN}.conf
- dosed "s/apache/apache2/g" /etc/webalizer.conf
-
- dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
-
- webapp_src_install
-}
-
-pkg_postinst() {
- elog
- elog "It is suggested that you restart apache before using webalizer"
- elog "You may want to review /etc/webalizer.conf and ensure that"
- elog "OutputDir is set correctly"
- elog
- elog "Then just type webalizer to generate your stats."
- elog "You can also use cron to generate them e.g. every day."
- elog "They can be accessed via http://localhost/webalizer"
- elog
- elog "A sample Apache config file has been installed into"
- elog "/usr/share/doc/${PF}/apache.webalizer"
- elog "Please edit and install it as necessary"
- elog
-
- if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
- ewarn
- ewarn "You have more than one language in LINGUAS"
- ewarn "Due to the limitations of this packge, it was built"
- ewarn "only with ${LINGUAS:0:2} support. If this is not what"
- ewarn "you intended, please place the language you desire"
- ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
- ewarn
- fi
-
- if use xtended; then
- elog "Read http://patrickfrei.ch/webalizer/${XTENDED_URL}/INSTALL"
- elog "if you are switching from stock webalizer to xtended"
- fi
-
- webapp_pkg_postinst
-}
diff --git a/app-admin/webalizer/webalizer-2.21.02.ebuild b/app-admin/webalizer/webalizer-2.21.02.ebuild
index cbead6a3bb7a..271ea346c206 100644
--- a/app-admin/webalizer/webalizer-2.21.02.ebuild
+++ b/app-admin/webalizer/webalizer-2.21.02.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.11 2012/10/28 20:13:19 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.12 2012/11/29 12:25:08 blueness Exp $
# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
@@ -15,7 +15,7 @@ MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
+HOMEPAGE="http://www.webalizer.org/"
SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
mirror://gentoo/${PN}.conf.gz"
diff --git a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild b/app-admin/webalizer/webalizer-2.23.05.ebuild
similarity index 73%
rename from app-admin/webalizer/webalizer-2.01.10-r16.ebuild
rename to app-admin/webalizer/webalizer-2.23.05.ebuild
index ba48708926e8..d1143a2ba789 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.05.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.5 2010/10/28 03:35:18 sping Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.05.ebuild,v 1.2 2012/11/29 12:25:08 blueness Exp $
# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
-inherit confutils eutils webapp db-use autotools
-WEBAPP_MANUAL_SLOT="yes"
+EAPI="2"
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
+inherit versionator confutils eutils webapp db-use
-XTENDED_VER="RB21"
-XTENDED_URL="rb21"
-GEOLIZER_VER="20070115"
+WEBAPP_MANUAL_SLOT="yes"
+XTENDED_VER="RB29"
+XTENDED_URL="rb29"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+MY_P="${PN}-${MY_PV}"
DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${MY_P}-src.tar.bz2
- geoip? (
- http://sysd.org/stas/files/active/0/geolizer_${MY_PV}-patch.${GEOLIZER_VER}.tar.gz )
+HOMEPAGE="http://www.webalizer.org/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
+ ftp://ftp.mrunix.net/pub/webalizer/webalizer-geodb-latest.tgz
mirror://gentoo/${PN}.conf.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="geoip nls xtended"
SLOT="0"
@@ -34,7 +32,7 @@ DEPEND=">=sys-libs/db-4.2
>=sys-libs/zlib-1.1.4
>=media-libs/libpng-1.2
>=media-libs/gd-1.8.3
- geoip? ( dev-libs/geoip )"
+ dev-libs/geoip"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/${MY_P}
@@ -52,19 +50,9 @@ pkg_setup() {
}
src_prepare() {
- if use geoip && ! use xtended; then
- epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \
- "${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch
- else
- epatch "${FILESDIR}"/${PN}-db4.2.patch
- if use xtended; then
- epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
- else
- epatch "${FILESDIR}"/${PN}-storage-size.patch
- fi
+ if use xtended; then
+ epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
fi
-
- eautoreconf
}
src_configure() {
@@ -82,8 +70,9 @@ src_configure() {
econf --enable-dns \
--with-db=$(db_includedir) \
--with-dblib=$(db_libname) \
- $(use_enable geoip) \
${myconf} \
+ $(use_enable geoip) \
+ --with-geodb=/usr/share/webalizer/geodb \
|| die "econf failed"
}
@@ -98,6 +87,9 @@ src_install() {
doins "${WORKDIR}"/${PN}.conf
dosed "s/apache/apache2/g" /etc/webalizer.conf
+ insinto /usr/share/webalizer/geodb
+ doins "${WORKDIR}"/GeoDB.dat
+
dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
webapp_src_install
@@ -128,10 +120,5 @@ pkg_postinst() {
ewarn
fi
- if use xtended; then
- elog "Read http://patrickfrei.ch/webalizer/${XTENDED_URL}/INSTALL"
- elog "if you are switching from stock webalizer to xtended"
- fi
-
webapp_pkg_postinst
}
diff --git a/app-arch/libpar2/libpar2-0.2.1.ebuild b/app-arch/libpar2/libpar2-0.2.1.ebuild
index 3fe28b124270..78b61a2633a4 100644
--- a/app-arch/libpar2/libpar2-0.2.1.ebuild
+++ b/app-arch/libpar2/libpar2-0.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.3 2012/11/25 10:54:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.4 2012/11/29 20:33:50 ranger Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE="static-libs"
RDEPEND="dev-libs/libsigc++:2"
diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc
index 990cccabd537..f08d2e9027ce 100644
--- a/app-editors/nano/files/gentoo.nanorc
+++ b/app-editors/nano/files/gentoo.nanorc
@@ -17,9 +17,9 @@ color magenta "\