Mercurial > hg > portage

--- a/app-admin/collectd/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-AUX collectd-4.4.2-ipvs.patch 1640 RMD160 2b76ac06ba80d3476e58c032afeb43f3693fa559 SHA1 1d122491b04a6711c2af58834ed5b27afee316f8 SHA256 5f5112b30c4209241e71ddcfc0a0781a13a94b5b13475b0898e0e04f65691aa3
-AUX collectd-4.4.2-libtool-compatibility.patch 539 RMD160 51e4fa64bf4e46ec20568c1e4001fad481d8a3d3 SHA1 242304facdd97f450cd5af01b89cbb7d0b2fcecf SHA256 64a08960230691bac9fbd1dc5f71da57e63ffa7a1ad0c4ee9587a675579d38d8
-AUX collectd-4.4.2-localstatedir.patch 326 RMD160 af64ae163399a4378586151a8449a58ea8df921f SHA1 7bbfdb7f1605077232804d255aeeb53aa6349002 SHA256 1129ab4006b900df2d81ace6eddb8e42f2a9eda99cb920fbd7ae7def25bfc730
-AUX collectd-4.4.2.confd 519 RMD160 f4f3a699b9e8ce3e11522a3a521089793824fffd SHA1 2477a4acab05455ea7e1072663dcb5c381f175a6 SHA256 f043ad355fd7f5d2f017207d6cec7be5ac8c27d12aca19f1fd6541ea230d24b6
-AUX collectd-4.4.2.initd 801 RMD160 3e195dba9144906e4a364635eb48236f35e81100 SHA1 b4fdf02ea754c6a6067b895213cb9b8ed4a8bb76 SHA256 edf081f989a38c77ec4f5de3050b8e7ee96a8a420e15ac02d1d0bb8546391c8d
-DIST collectd-4.4.2.tar.bz2 931183 RMD160 d75efad3dbc13caeeaf3479764c09f5850e2431b SHA1 13c5658fc8975be4c5d99031999820efa4119eb0 SHA256 d977f58c03d31568a5f5b637cff7399c9be98dea116f0927d4d087350d48838c
-EBUILD collectd-4.4.2.ebuild 5897 RMD160 492afe41ca886eb9c32a93eaf1217831459fdc88 SHA1 0926bd8ed372938e51f887442a68f0945316f38e SHA256 866f7de4e0896b580440ac4551a0818e507148f96436c816e982d055ca33f02a
--- a/app-admin/collectd/collectd-4.4.2.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils flag-o-matic linux-info
-
-DESCRIPTION="A small daemon which collects system performance statistics"
-HOMEPAGE="http://collectd.org"
-
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-HTTP_FLAGS="apache2 lighttpd nginx"
-LIBVIRT_FLAGS="kvm openvz qemu xen"
-IUSE="apcups dns email hal hddtemp ipmi ithreads lm_sensors
-    memcache mysql network nfs ntp nut perl rrdtool snmp
-    syslog vserver wifi ${HTTP_FLAGS} ${LIBVIRT_FLAGS}
-"
-HTTP_DEPEND="
-    apache2?	( >=net-misc/curl-7.17.0 )
-    lighttpd?	( >=net-misc/curl-7.17.0 )
-    nginx?	( >=net-misc/curl-7.17.0 )
-"
-LIBVIRT_DEPEND="
-    kvm?	( >=app-emulation/libvirt-0.3.3 )
-    openvz?	( >=app-emulation/libvirt-0.3.3 )
-    qemu?	( >=app-emulation/libvirt-0.3.3 )
-    xen?	( >=app-emulation/libvirt-0.3.3 )
-"
-COMMON_DEPEND="${HTTP_DEPEND} ${LIBVIRT_DEPEND}
-    dns?	( >=net-libs/libpcap-0.9.8 )
-    hal?	( >=sys-apps/hal-0.5.9.1-r3 )
-    ipmi?	( >=sys-libs/openipmi-2.0.11 )
-    lm_sensors?	( >=sys-apps/lm_sensors-2.10.4 )
-    mysql?	( >=virtual/mysql-5.0 )
-    perl?	( >=dev-lang/perl-5.8.8-r4 )
-    nut?	( >=sys-power/nut-2.2.0 )
-    rrdtool?	( >=net-analyzer/rrdtool-1.2.27 )
-    snmp?	( >=net-analyzer/net-snmp-5.4.1-r3 )
-"
-DEPEND="${COMMON_DEPEND}
-    sys-devel/libtool
-    >=dev-libs/libxml2-2.6.31
-"
-RDEPEND="${COMMON_DEPEND}
-    apcups?	( >=sys-power/apcupsd-3.14.2 )
-    !hal?	( >=sys-apps/dmidecode-2.9 )
-    hddtemp?	( >=app-admin/hddtemp-0.3_beta15-r3 )
-    memcache?	( >=net-misc/memcached-1.2.2-r2 )
-    ntp?	( >=net-misc/ntp-4.2.4_p4 )
-    syslog?	( virtual/logger )
-"
-
-pkg_setup()
-{
-    linux-info_pkg_setup
-    local flag
-
-    (linux_chkconfig_present ACPI_BATTERY) \
-    || ewarn "ACPI_BATTERY needs to be enabled in your kernel for the battery plug-in to work correctly"
-    (linux_chkconfig_present CPU_FREQ) \
-    || ewarn "CPU_FREQ needs to be enabled in your kernel for the cpufreq plug-in to work correctly"
-    (linux_chkconfig_present SERIAL_CORE) \
-    || ewarn "SERIAL_CORE needs to be enabled in your kernel for the serial plug-in to work correctly"
-    (linux_chkconfig_present SWAP) \
-    || ewarn "SWAP needs to be enabled in your kernel for the swap plug-in to work correctly"
-    (use vserver) && !(linux_chkconfig_present IP_VS) \
-    && ewarn "IP_VS should to be enabled in your kernel when the USE flag vserver is enabled"
-
-    for flag in "${LIBVIRT_FLAGS}"; do
-        (use ${flag}) && !(built_with_use app-emulation/libvirt ${flag}) && \
-	die "USE flag ${flag} requires that libvirt was compiled with the USE flag ${flag}"
-    done
-
-    if (use perl); then
-	if (use ithreads); then
-	    (built_with_use perl ithreads) \
-	    || die "The perl plug-in requires that libperl was compiled with the USE flag ithreads"
-	else
-	    ewarn "The perl plug-in requires the ithreads USE flag."
-	fi
-    fi
-
-    ((linux_chkconfig_present PROC_FS) && (linux_chkconfig_present SYSFS)) \
-    || die "${P} requires that PROC_FS and SYSFS are enabled in your kernel"
-}
-
-src_unpack()
-{
-    unpack ${A}
-    cd "${S}"
-
-    ebegin "Applying sed no-automagic-patch"
-    sed -i -e '/^AC_PLUGIN/ s/\ [[].*[]],/[no],/' \
-    configure.in \
-    || die "sed no-automagic-patch failed"
-    eend 0
-
-    epatch "${FILESDIR}/${PN}-4.4.2-ipvs.patch"
-    epatch "${FILESDIR}/${PN}-4.4.2-localstatedir.patch"
-    epatch "${FILESDIR}/${PN}-4.4.2-libtool-compatibility.patch"
-
-    ebegin "Remove provided libtool/libltdl"
-    rm -R ./libltdl \
-    && rm config.guess config.sub install-sh ltmain.sh \
-    || die "removing libtool failed"
-    eend 0
-
-    eautoreconf || die "eautoreconf failed"
-}
-
-src_compile()
-{
-    local flag
-    local myconf
-    local no_check_plugins="csv df logfile multimeter tail users uuid"
-    local proc_sys_fs_plugins="battery cpu cpufreq disk entropy irq load memory processes serial swap vmem"
-    local network_plugins="interface iptables network ping teamspeak2 tcpconns unixsock"
-
-    for flag in ${no_check_plugins} ${proc_sys_fs_plugins}; do
-	myconf+=" --enable-${flag}"
-    done
-
-    if (use network); then
-	for flag in ${network_plugins}; do
-	    myconf+=" --enable-${flag}"
-	done
-    fi
-
-    myconf+="
-    $(( use apache2 || use lighttpd ) && echo --enable-apache)
-    $(use_enable apcups)
-    $(use_enable dns)
-    $(use_enable hddtemp)
-    $(use_enable email)
-    $(use_enable ipmi)
-    $(use_enable vserver ipvs)
-    $(( use kvm || use openvz || use qemu || use xen ) && echo --enable-libvirt)
-    $(use_enable memcache memcached)
-    $(use_enable mysql)
-    $(use_enable nfs)
-    $(use_enable nginx)
-    $(use_enable ntp ntpd)
-    $(use_enable nut)
-    $(use_enable dns powerdns)
-    $(use_enable snmp)
-    $(use_enable syslog)
-    $(use_enable rrdtool)
-    $(use_enable vserver)
-    $(use_enable lm_sensors sensors)
-    $(use_enable wifi wireless)"
-
-    myconf+="
-    $(use ithreads && use_enable perl)
-    $(use_with perl perl-bindings)"
-
-    KERNEL_DIR="${KERNEL_DIR}" econf \
-    --localstatedir=/var ${myconf} \
-    || die "econf failed"
-
-    emake || die "emake failed"
-}
-
-src_install()
-{
-    emake DESTDIR="${D}" install || die "emake install failed"
-
-    dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-
-    insinto /usr/share/doc/${PF}
-    doins -r contrib || die "doins contrib failed"
-
-    keepdir /var/lib/${PN} || die "keepdir failed"
-
-    newinitd "${FILESDIR}/${PN}-4.4.2.initd" ${PN} || die "newinitd failed"
-    newconfd "${FILESDIR}/${PN}-4.4.2.confd" ${PN} || die "newconfd failed"
-}
-
-pkg_postinst()
-{
-    einfo
-    einfo "collectd introduced some changes in the new 4.x series."
-    einfo "For further information, read ${HOMEPAGE}/migrate-v3-v4.shtml"
-    einfo "The migration script can be found at:"
-    einfo "/usr/share/doc/${PF}/contrib/migrate-3-4.px"
-    einfo
-}
--- a/app-admin/collectd/files/collectd-4.4.2-ipvs.patch	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
---- configure.in.orig	2008-08-05
-+++ configure.in	2008-08-05
-@@ -50,6 +50,18 @@
- esac
- AC_MSG_RESULT([$ac_system])
-
-+if test "x$ac_system" = "xLinux"
-+then
-+	AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources])
-+	if test -z "$KERNEL_DIR"
-+	then
-+		KERNEL_DIR="/lib/modules/`uname -r`/source"
-+	fi
-+
-+	KERNEL_CFLAGS="-I$KERNEL_DIR/include"
-+	AC_SUBST(KERNEL_CFLAGS)
-+fi
-+
- #
- # Checks for header files.
- #
-@@ -278,8 +290,13 @@
- have_ip_vs_h="no"
- if test "x$ac_system" = "xLinux"
- then
-+	SAVE_CFLAGS=$CFLAGS
-+	CFLAGS="$CFLAGS $KERNEL_CFLAGS"
-+
- 	AC_CHECK_HEADERS(net/ip_vs.h, [have_net_ip_vs_h="yes"])
- 	AC_CHECK_HEADERS(ip_vs.h, [have_ip_vs_h="yes"])
-+
-+	CFLAGS=$SAVE_CFLAGS
- fi
-
- # For quota module
-@@ -1599,15 +1616,6 @@
- 	LDFLAGS=$SAVE_LDFLAGS
- fi
-
--if test "x$ac_system" = "xLinux"
--then
--	AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources])
--	if test -z "$KERNEL_DIR"
--	then
--		KERNEL_DIR="/lib/modules/`uname -r`/source"
--	fi
--fi
--
- with_own_libiptc="no"
- AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
- [
-@@ -1653,7 +1661,7 @@
- if test "x$with_libiptc" = "xyes"
- then
- 	SAVE_CFLAGS=$CFLAGS
--	CFLAGS="$CFLAGS -I$KERNEL_DIR/include"
-+	CFLAGS="$CFLAGS $KERNEL_CFLAGS"
-
- 	AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
- 	[
---- src/Makefile.am.orig	2008-08-05
-+++ src/Makefile.am	2008-08-05
-@@ -311,6 +311,7 @@
- if BUILD_PLUGIN_IPVS
- pkglib_LTLIBRARIES += ipvs.la
- ipvs_la_SOURCES = ipvs.c
-+ipvs_la_CFLAGS = $(KERNEL_CFLAGS)
- ipvs_la_LDFLAGS = -module -avoid-version
- collectd_LDADD += "-dlopen" ipvs.la
- collectd_DEPENDENCIES += ipvs.la
--- a/app-admin/collectd/files/collectd-4.4.2-libtool-compatibility.patch	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
---- configure.in.orig	2008-08-03
-+++ configure.in	2008-08-03
-@@ -22,7 +22,7 @@
-
- dnl configure libtool
- AC_DISABLE_STATIC
--AC_LIBLTDL_CONVENIENCE
-+AC_WITH_LTDL
- AC_SUBST(LTDLINCL)
- AC_SUBST(LIBLTDL)
- AC_LIBTOOL_DLOPEN
-@@ -30,7 +30,6 @@
- AC_PROG_LEX
- AC_PROG_YACC
- PKG_PROG_PKG_CONFIG
--AC_CONFIG_SUBDIRS(libltdl)
-
- AC_MSG_CHECKING([for kernel type ($host_os)])
- case $host_os in
---- Makefile.am.orig	2008-08-03
-+++ Makefile.am	2008-08-03
-@@ -1,4 +1,4 @@
--SUBDIRS = libltdl src bindings
-+SUBDIRS = src bindings
-
- INCLUDES = $(LTDLINCL)
-
--- a/app-admin/collectd/files/collectd-4.4.2-localstatedir.patch	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2008-08-07
-+++ Makefile.am	2008-08-07
-@@ -3,8 +3,3 @@
- INCLUDES = $(LTDLINCL)
-
- EXTRA_DIST = contrib version-gen.sh
--
--install-exec-hook:
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
--- a/app-admin/collectd/files/collectd-4.4.2.confd	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# File used to store the PID file. Usually you won't need to touch it.
-#COLLECTD_PIDFILE='/var/run/collectd.pid'
-
-# Nice value used to launch collectd, to change priority of the process. As
-# you usually will want to run it in background, a default of 5 is used.
-#COLLECTD_NICE='5'
-
-# Location of configuration file. Modify if you don't like the standard one.
-#COLLECTD_CONFIG='/etc/collectd.conf'
--- a/app-admin/collectd/files/collectd-4.4.2.initd	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Assign defaults to parameters from /etc/conf.d/collectd
-: ${COLLECTD_PIDFILE:='/var/run/collectd.pid'}
-: ${COLLECTD_NICE:='5'}
-: ${COLLECTD_CONFIG:='/etc/collectd.conf'}
-
-depend()
-{
-    after logger net firewall dns \
-	lm_sensors cpufreqd nfs apache lighttpd nginx mysql
-}
-
-start()
-{
-    ebegin "Starting collectd"
-    start-stop-daemon --start --pidfile ${COLLECTD_PIDFILE} \
-	--nice ${COLLECTD_NICE} --exec /usr/sbin/collectd \
-	-- -P ${COLLECTD_PIDFILE} -C ${COLLECTD_CONFIG}
-    eend $? "Failed to start collectd"
-}
-
-stop()
-{
-    ebegin "Stopping collectd"
-    start-stop-daemon --stop --pidfile ${COLLECTD_PIDFILE}
-    eend $? "Failed to stop collectd"
-}
--- a/app-arch/pigz/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-AUX pigz-2.1.5-decode-symlinks-to-stdout.patch 512 RMD160 115ae0cdc4187b8cbc2282c3b36aca5f0b8ea5b1 SHA1 158f21fa736d9034b608d5b6fd452919f7d73e51 SHA256 067acf2075e80ef083dd730a557bff87efb39a80b49be760c84bfa4cd73047ce
-AUX pigz-2.1.5-gunzip-compat.patch 630 RMD160 eb1ac6a99fe17fb6c9d7029912109630e5ec984b SHA1 98c4132001d2ab808e70a728c87c9afe2d549f42 SHA256 4a2b6acde824b15453a0647c7830f7444247606aece3979b6b85b90eeb7adef1
-AUX pigz-2.1.5-respect-flags.patch 404 RMD160 e444679d43a33f44c684d99ec782f825bef66bab SHA1 8557dea8496682fa9525278b314178f5c100c9b2 SHA256 8806680b9d1f4099f7f2caa803957b104f2df24bed49b0a41f696060b43b69c4
-DIST pigz-2.1.5.tar.gz 93788 RMD160 b02f012e9f87f9f69309574ef7000bf6242b2114 SHA1 9e169aa2f1b08be057760c03c480e64651fa3299 SHA256 ae1f16f1f84c963df512a24f5b676a776ffd95f059291547672917b2f818e53b
-EBUILD pigz-2.1.5.ebuild 989 RMD160 4305c3bde1dad21490bd29e3513b73e4879e9701 SHA1 4110d612ee09351ba97ba0eefb90f3bde4efa71b SHA256 a79b2b9f18b73138f86de65b368987c7141355b5b1de2dbca6c6e6031a961751
--- a/app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -u pigz-2.1.5/pigz.c pigz-2.1.5-fix/pigz.c
---- pigz-2.1.5/pigz.c	2009-07-20 04:42:00.000000000 +0200
-+++ pigz-2.1.5-fix/pigz.c	2009-10-25 15:52:22.000000000 +0100
-@@ -2498,7 +2498,7 @@
-                         in);
-             return;
-         }
--        if ((st.st_mode & S_IFMT) == S_IFLNK && !force) {
-+        if ((st.st_mode & S_IFMT) == S_IFLNK && !force && !pipeout) {
-             if (verbosity > 0)
-                 fprintf(stderr, "%s is a symbolic link -- skipping\n", in);
-             return;
--- a/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- ../pigz-2.1.5/pigz.c	2009-07-20 04:42:00.000000000 +0200
-+++ pigz.c	2009-11-24 10:50:13.000000000 +0100
-@@ -3075,9 +3075,17 @@
-     if (argc < 2 && isatty(1))
-         help();
-
--    /* decompress if named "unpigz" */
-+    /* find program name */
-     p = strrchr(argv[0], '/');
--    if (strcmp(p == NULL ? argv[0] : p + 1, "unpigz") == 0)
-+    if (p == NULL) {
-+        p = argv[0];
-+    }
-+    else {
-+        ++p;
-+    }
-+
-+    /* decompress if named "unpigz" or "gunzip" */
-+    if ((strcmp(p, "unpigz") == 0) || (strcmp(p, "gunzip") == 0))
-         decode = 1, headis = 0;
-
-     /* process command-line arguments */
--- a/app-arch/pigz/files/pigz-2.1.5-respect-flags.patch	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -U5 pigz-2.1.5.original/Makefile pigz-2.1.5/Makefile
---- pigz-2.1.5.original/Makefile	2009-10-27 22:41:31.000000000 -0600
-+++ pigz-2.1.5/Makefile	2009-10-27 22:42:45.000000000 -0600
-@@ -1,9 +1,7 @@
--CFLAGS=-O2
--
- pigz: pigz.o yarn.o
--	cc -o pigz pigz.o yarn.o -lpthread -lz
-+	$(CC) $(LDFLAGS) -o pigz pigz.o yarn.o -lpthread -lz
- 	ln -f pigz unpigz
-
- pigz.o: pigz.c yarn.h
-
- yarn.o: yarn.c yarn.h
--- a/app-arch/pigz/pigz-2.1.5.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.1.5.ebuild,v 1.2 2009/11/02 17:58:48 vostorga Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A parallel implementation of gzip."
-HOMEPAGE="http://www.zlib.net/pigz/"
-SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="PIGZ"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="test symlink"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	test? ( app-arch/ncompress )"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-respect-flags.patch
-	epatch "${FILESDIR}"/${P}-decode-symlinks-to-stdout.patch
-	epatch "${FILESDIR}"/${P}-gunzip-compat.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin ${PN} || die "Failed to install"
-	dosym /usr/bin/pigz /usr/bin/unpigz
-	dodoc README
-
-	if use symlink; then
-		dosym /usr/bin/pigz /usr/bin/gzip
-		dosym /usr/bin/unpigz /usr/bin/gunzip
-	fi
-}
--- a/dev-db/pgpool-II/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ b/dev-db/pgpool-II/Manifest	Tue Apr 27 14:21:11 2010 +0200
@@ -1,4 +1,3 @@
 AUX pgpool-II.init 397 RMD160 982661c7ed406af8cee485aec125a3c28320d008 SHA1 b0433f446f98acd2ca82930f073c6fd886ce19a7 SHA256 fc1f92d95d198a4fa7a4ae3e0bbad5ba093667c068550bd6a18bc86ab61252fa
-DIST pgpool-II-2.2.5.tar.gz 961675 RMD160 adfeb49ae04fc765b221b9232e1285d3f922e8d3 SHA1 877832eb777e0ab49feed24444a55fab3ff583b4 SHA256 2a404dd3965c5d869c17ab0c031395a43445d6fcf0c72df8bd78d9629b8ed25b
-EBUILD pgpool-II-2.2.5.ebuild 994 RMD160 7dd43fe7afbc7f84bdf5116282b7579a5bbb8107 SHA1 df1cba24be1f85459bfceca27d35e6ebb2dfa510 SHA256 57d1f158ac7c312a458810bdb73241bf71d767b3471407609a305d0900245385
-MISC pgpool-II-2.2.5.ebuild~ 1031 RMD160 7f676bc16621de36634b293fab0d26fca929cd74 SHA1 c5f8967885d9110e9e1a9c45e67eba885beacd18 SHA256 2a46ecb0f9bb3b5d2c5ea22f782003899ff7ba66811be69b1c074fe0b395623a
+DIST pgpool-II-2.3.1.tar.gz 961675 RMD160 adfeb49ae04fc765b221b9232e1285d3f922e8d3 SHA1 877832eb777e0ab49feed24444a55fab3ff583b4 SHA256 2a404dd3965c5d869c17ab0c031395a43445d6fcf0c72df8bd78d9629b8ed25b
+EBUILD pgpool-II-2.3.1.ebuild 994 RMD160 7dd43fe7afbc7f84bdf5116282b7579a5bbb8107 SHA1 df1cba24be1f85459bfceca27d35e6ebb2dfa510 SHA256 57d1f158ac7c312a458810bdb73241bf71d767b3471407609a305d0900245385
--- a/dev-db/pgpool-II/pgpool-II-2.2.5.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="New generation connection pool server for PostgreSQL"
-HOMEPAGE="http://pgpool.projects.postgresql.org/"
-SRC_URI="http://pgfoundry.org/frs/download.php/2108/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/postgresql-base"
-
-src_unpack() {
-        unpack ${A}
-        S="${WORKDIR}/${PN}-2.2"
-        cd ${S}
-        sed -i -e "/^logdir/s:/tmp:/var/run:g" pgpool.conf.sample || die
-}
-
-src_compile() {
-        econf || die
-        emake || die
-}
-
-src_install () {
-        einstall || die
-        mv ${D}/etc/pcp.conf.sample ${D}/etc/pcp.conf
-        mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf
-        mv ${D}/etc/pool_hba.conf.sample ${D}/etc/pool_hba.conf
-        dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-        newinitd "${FILESDIR}/pgpool-II.init" pgpool-II || die "Inserting init.d-file failed"
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-db/pgpool-II/pgpool-II-2.3.1.ebuild	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="New generation connection pool server for PostgreSQL"
+HOMEPAGE="http://pgpool.projects.postgresql.org/"
+SRC_URI="http://pgfoundry.org/frs/download.php/2108/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/postgresql-base"
+
+src_unpack() {
+        unpack ${A}
+        S="${WORKDIR}/${PN}-2.2"
+        cd ${S}
+        sed -i -e "/^logdir/s:/tmp:/var/run:g" pgpool.conf.sample || die
+}
+
+src_compile() {
+        econf || die
+        emake || die
+}
+
+src_install () {
+        einstall || die
+        mv ${D}/etc/pcp.conf.sample ${D}/etc/pcp.conf
+        mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf
+        mv ${D}/etc/pool_hba.conf.sample ${D}/etc/pool_hba.conf
+        dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+        newinitd "${FILESDIR}/pgpool-II.init" pgpool-II || die "Inserting init.d-file failed"
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/maven-bin/Manifest	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,2 @@
+DIST apache-maven-3.0-beta-1-bin.tar.gz 2589687 RMD160 0d8e9576a9b330bd759ec741b05011ad0f48ff5a SHA1 639ada216287e1f2689e5e142f1e21aa7560d3d2 SHA256 934503ece96b3def22f13d07dc5c78e990cacc971175d9f8a9850457e39bf7c5
+EBUILD maven-bin-3.0.0_beta1.ebuild 1066 RMD160 f32d6aa46380119f7ace75a2472cb3565b9fdf52 SHA1 27952f33ac686911787efa9b8180bf6f30c0275f SHA256 639a3fd3813c5e558985d22848e2fd637e6979954e6dec36673bd1bf7bff79e6
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/maven-bin/maven-bin-3.0.0_beta1.ebuild	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1.ebuild,v 1.3 2010/04/26 11:05:56 phajdan.jr Exp $
+
+inherit java-pkg-2
+inherit versionator
+
+MY_P="apache-maven-3.0-beta-1"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=virtual/jdk-1.5
+	app-admin/eselect-maven"
+
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_unpack() {
+	unpack ${A}
+
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt || die
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+}
--- a/dev-util/mercurial/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
-DIST mercurial-1.3.1.tar.gz 1770585 RMD160 1e43d8697e4d269fdc065ee82c48e1cf132f6d6f SHA1 a9537fab7c7ead501a6414d1900f46e0ae3e48b8 SHA256 ff928b557f41374974171df1b0384e33161aff97c5fe1c856a7b91bf3b154a62
-EBUILD mercurial-1.3.1.ebuild 3226 RMD160 743d444c471c607972c0cedb0da2599574b6672a SHA1 a29c432f1335a05cdf26aba60ccbb62e17540f5f SHA256 0f1b83d61da1f559d97d934c7c21601015cb8a622ece49344af3bc0294cca507
-MISC metadata.xml 645 RMD160 2a33b3987960796da78558e671c4e5e0c6f10241 SHA1 6cd04e19dc7796b53afe98a9831e128c4c96f3ca SHA256 e0b05e42345698eda32c513e3a8f14d8bf42d5344dcd804b1f2234da327524e2
--- a/dev-util/mercurial/files/70mercurial-gentoo.el	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-;;; mercurial site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
\ No newline at end of file
--- a/dev-util/mercurial/mercurial-1.3.1.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.7 2008/10/17 08:04:41 aballier Exp $
-
-inherit bash-completion elisp-common flag-o-matic eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://www.selenic.com/mercurial/"
-SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bugzilla emacs gpg test zsh-completion"
-
-CDEPEND=">=dev-lang/python-2.3"
-RDEPEND="${CDEPEND}
-	bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_compile() {
-	filter-flags -ftracer -ftree-vectorize
-
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx}
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcompletion contrib/bash_completion ${PN}
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg
-	fi
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
-	cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/
-
-	dobin contrib/hgk
-	dobin contrib/hg-relink
-	dobin contrib/hg-ssh
-
-	rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh
-
-	rm -f contrib/bash_completion
-	cp -r contrib "${D}"/usr/share/doc/${PF}/
-	doman doc/*.?
-
-	cat > "${T}/80mercurial" <<-EOF
-HG=/usr/bin/hg
-EOF
-	doenvd "${T}/80mercurial"
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	local testdir="${T}/tests"
-	mkdir -p -m1777 "${testdir}" || die
-	cd "${S}/tests/"
-	rm -f *svn*		# Subversion tests fail with 1.5
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	rm -f test-doctest*		# doctest always fails with python 2.5.x
-	if ! has userpriv ${FEATURES}; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template	# Test is broken when run as root
-		rm -f test-convert			# Test is broken when run as root
-		rm -f test-lock-badness		# Test is broken when run as root
-		rm -f test-permissions		# Test is broken when run as root
-		rm -f test-pull-permission	# Test is broken when run as root
-	fi
-	einfo "Running Mercurial tests ..."
-	python run-tests.py --tmpdir="${testdir}" || die "test failed"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-util/cvs"
-	elog "  dev-util/darcs"
-	elog "  dev-util/git"
-	elog "  dev-util/monotone"
-	elog "  dev-util/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
--- a/dev-util/mercurial/metadata.xml	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>nelchael@gentoo.org</email>
-    <name>Krzysiek Pawlik</name>
-  </maintainer>
-  <use>
-    <flag name="bugzilla">Support bugzilla integration.</flag>
-    <flag name="darcs">Support conversion of Darcs repositories to Mercurial.</flag>
-    <flag name="git">Support conversion of Git repositories to Mercurial.</flag>
-    <flag name="gpg">Support signing with GnuPG.</flag>
-    <flag name="zsh-completion">Install zsh command completion for hg.</flag>
-  </use>
-</pkgmetadata>
--- a/media-gfx/graphicsmagick/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-DIST GraphicsMagick-1.3.7.tar.bz2 6581207 RMD160 56a7408d2f3fc15be2859a0d5b3c42e0549faf0c SHA1 e65c4d799704245216821374f66de5796795c263 SHA256 0d2e8f81574efc7e16c05b72fc9a62a2ba333d6fa196bdb72f8fda8ce7a585fc
-EBUILD graphicsmagick-1.3.7.ebuild 3000 RMD160 e1e5427162790a7061ca7cdda4a7f76a6a7b60b1 SHA1 4caa266b188ac6e6a393771c6c6eb6097ad074d6 SHA256 95dd7987620ab2b264326e45f810dfdb5144aa6a79ea77f2ab0ccb39a518ede4
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild,v 1.1 2009/11/24 00:20:48 bicatali Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs flag-o-matic perl-app
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 cxx debug fpx -gs imagemagick jbig +jpeg +jpeg2k lcms openmp
-	perl +png q16 q32 +svg +threads tiff +truetype X wmf zlib"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	gs? ( virtual/ghostscript )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( media-libs/jpeg )
-	jpeg2k? ( >=media-libs/jasper-1.701.0 )
-	lcms? ( media-libs/lcms )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( >=media-libs/tiff-3.8.2 )
-	truetype? ( >=media-libs/freetype-2.0 )
-	wmf? ( media-libs/libwmf )
-	X? ( x11-libs/libXext
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libICE )
-	imagemagick? ( !media-gfx/imagemagick )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! built_with_use sys-devel/gcc openmp )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build fftw with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
-		epause 5
-	fi
-}
-
-src_configure() {
-	local quantumDepth
-	if use q16 ; then
-		quantumDepth="16"
-	elif use q32 ; then
-		quantumDepth="32"
-	else
-		quantumDepth="8"
-	fi
-
-	use debug && filter-flags -fomit-frame-pointer
-
-	econf \
-		--enable-shared \
-		--enable-largefile \
-		--without-included-ltdl \
-		--without-frozenpaths \
-		--with-modules \
-		--with-quantum-depth=${quantumDepth} \
-		$(use_enable debug ccmalloc) \
-		$(use_enable debug prof) \
-		$(use_enable debug gcov) \
-		$(use_enable imagemagick magick-compat) \
-		$(use_enable openmp) \
-		$(use_with bzip2 bzlib) \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with fpx) \
-		$(use_with gs gslib) \
-		$(use_with jbig) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with svg xml) \
-		$(use_with threads) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		$(use_with X x) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc README.txt ChangeLog* NEWS.txt TODO.txt
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	elog "For RAW image suport please install media-gfx/dcraw."
-	elog "For mpeg suport please install media-video/mpeg2vidcodec."
-	elog "To read gnuplot files please install sci-visualization/gnuplot."
-}
--- a/net-misc/rabbitmq-server/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ b/net-misc/rabbitmq-server/Manifest	Tue Apr 27 14:21:11 2010 +0200
@@ -1,3 +1,3 @@
 AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c
-DIST rabbitmq-server-1.7.0.tar.gz 143252 RMD160 092f90946825cc3eb277019805e24db637a559f4 SHA1 84fb86d403057bb808c1b51deee0c1fca3bf7bef SHA256 a73c25ff0e725a2b9afb37e3796ad46c32f5f6c097091f6c0e40ccc878db9e4a
-EBUILD rabbitmq-server-1.7.0.ebuild 1835 RMD160 c9cf9a9e17384ca7fd6813020e34a2ea87026aee SHA1 1e47e69b5a5f7d41469af1458ec733b05326c751 SHA256 3287ea3483e1eca2763798d0d6ec8204acc39170d6f8770e6c1c3ff5e1d20638
+DIST rabbitmq-server-1.7.2.tar.gz 156201 RMD160 ba2db97f88a3b51c6246307244e3f5b40112bb36 SHA1 ecc35617cc14cca7752f67b845bcc97e421254b4 SHA256 7a3f1a0324dbd1b450c85907fb43e92739f5c9708cf8550ef960a6eea9f488dd
+EBUILD rabbitmq-server-1.7.2.ebuild 1835 RMD160 c9cf9a9e17384ca7fd6813020e34a2ea87026aee SHA1 1e47e69b5a5f7d41469af1458ec733b05326c751 SHA256 3287ea3483e1eca2763798d0d6ec8204acc39170d6f8770e6c1c3ff5e1d20638
--- a/net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild,v 1.1 2009/06/21 15:45:19 caleb Exp $
-
-inherit eutils
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Q: is RDEPEND-only sufficient for a binary package, since we don't compile?
-DEPEND="dev-lang/erlang
-	dev-python/simplejson"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Correcting additional Erlang code path in scripts"
-	sed -i -e "s:\`dirname \$0\`/rabbitmq-env:/usr/sbin/rabbitmq-env:g" scripts/* || die "sed failed"
-
-	einfo "Installing Erlang module to ${targetdir}"
-	dodir "${targetdir}"
-	cp -dpR ebin include "${D}/${targetdir}"
-
-	einfo "Installing server scripts to /usr/sbin"
-	# Install server scripts to sbin
-	dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server \
-	    scripts/rabbitmq-server scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins
-
-	einfo "Installing rabbitmqctl to /usr/bin"
-	# Install control script to bin
-	dobin scripts/rabbitmqctl
-
-	# Docs
-	dodoc README
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq/mnesia
-
-	# Install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq
-}
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 -1 rabbitmq
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/rabbitmq-server/rabbitmq-server-1.7.2.ebuild	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild,v 1.1 2009/06/21 15:45:19 caleb Exp $
+
+inherit eutils
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Q: is RDEPEND-only sufficient for a binary package, since we don't compile?
+DEPEND="dev-lang/erlang
+	dev-python/simplejson"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Correcting additional Erlang code path in scripts"
+	sed -i -e "s:\`dirname \$0\`/rabbitmq-env:/usr/sbin/rabbitmq-env:g" scripts/* || die "sed failed"
+
+	einfo "Installing Erlang module to ${targetdir}"
+	dodir "${targetdir}"
+	cp -dpR ebin include "${D}/${targetdir}"
+
+	einfo "Installing server scripts to /usr/sbin"
+	# Install server scripts to sbin
+	dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server \
+	    scripts/rabbitmq-server scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins
+
+	einfo "Installing rabbitmqctl to /usr/bin"
+	# Install control script to bin
+	dobin scripts/rabbitmqctl
+
+	# Docs
+	dodoc README
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	dodir /var/lib/rabbitmq/mnesia
+
+	# Install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq
+}
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 -1 rabbitmq
+}
--- a/net-misc/zmq/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-DIST zmq-1.0.0.tar.gz 1000538 RMD160 2a739a6ecbbf89940d9ef63802f08b19032c2210 SHA1 2013d8739ab03b14f28f46a355171d9680c27b20 SHA256 c6d13da3cc3430d6cab9f8b918d35f93c22397d1f02b7cc241fb3dae6bbfbc3c
-EBUILD zmq-1.0.0.ebuild 1083 RMD160 e2289a32e90db7832116834999fd3ba2621bbec5 SHA1 8854d35583d81f38f935ff52e1cfbc243e39332a SHA256 97a1caf1389ff457cd60f909dd4cf7cd44973d992938764bd7b55be08d03cc02
--- a/net-misc/zmq/zmq-1.0.0.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="ZeroMQ is a brokerless messaging kernel with extremely high performance."
-HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="http://www.zeromq.org/local--files/area:download/${P}.tar.gz"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="amqp c examples java profile python ruby"
-#DEPEND=""
-#RDEPEND="${DEPEND}"
-
-src_compile() {
-
-# TODO:
-#  --with-perf             build performance tests [default=no]
-#  --with-butterfly        build butterfly example [default=no]
-#  --with-camera           build camera example [default=no]
-#  --with-exchange         build exchange example [default=no]
-#  --with-chat             build chatroom example [default=no]
-#  --with-ruby             build Ruby language binding [default=no]
-
-	econf \
-    $(use_with amqp) \
-    $(use_with c) \
-    $(use_with java) \
-    $(use_with python)
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
--- a/net-nntp/leafnode/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-AUX fetchnews.cron 177 RMD160 b7bf11b578a225366e9edb25cbbe0cf4f4d8fb40 SHA1 5a84614e95f53f0f3bd216b4831e19d6e1803179 SHA256 4fc9999fb5598c5c6df96b72ca876cee5b7b485df5c86bb2f454f4a129dfe981
-AUX leafnode.xinetd 230 RMD160 f63477f421d3c5205d2c332317f43543bac00196 SHA1 f70cd64ef1aa9ca9ee67665195375c187ee38f3e SHA256 a8dd35146f27ad737eeab74512fb01f17ba526769d218fc4a9ff2225b0827828
-AUX local.groups 83 RMD160 98681fc4ab29dd001f97b4b98aa311df3f0ac900 SHA1 822c00162601007f85937acb3a913457ad00367c SHA256 e69c4ee697c241c4c4c2d863ee207e7e6a636f2d6c8d344507e9803a2c01411e
-AUX moderators 29 RMD160 31e2b6881cdaa97b22a40265581fd6ffc42bffca SHA1 bd6beec976325b1d7b2a59f18e587066161577a3 SHA256 4e887f2b97e2d4c287165d31c098f92d8d98b6740363abf6bfa7cbba268bbc3f
-AUX texpire.cron 158 RMD160 5dc4751c8b2c5a0f0845d6655a5b6f3ae25aad26 SHA1 a74b5cf877c1c33425efd2b1b64a25d5eff1fa52 SHA256 acd65f4a3b6ddbee3e1f21a4aa1ce0124e7983bfe9387bc379079c2e621f745f
-DIST leafnode-2.0.0.alpha20070602a.tar.bz2 357707 RMD160 078c77c1db5f8b2d2c2117a40088660f5a9c1a7b SHA1 16ad01982dc0bdba7572307094c3ffcb86a18bc9 SHA256 322daf48ff52124df2e2940e6bc86e7869648388076bb7aff5afb1a82233b2a0
-EBUILD leafnode-2.0.0_alpha20070602.ebuild 1642 RMD160 7baf16940fa669f85963c7ea14765232544e7f5c SHA1 02d5f350d812222226ad05a55892744b566fc74c SHA256 3fa2acbe9e18b2ff5be686e64f03a91dfaa69a457c90b5ba6c4caff6dcb18e9b
--- a/net-nntp/leafnode/files/fetchnews.cron	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# Uncomment the following if you want to regularly
-# fetch new messages from your news server.
-#
-#
-# This is part of the leafnode package.
-#
-
-#/usr/sbin/fetchnews
--- a/net-nntp/leafnode/files/leafnode.xinetd	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# default: off
-# description: Leafnode - accepts connections on port 119 (NNTP)
-
-service nntp
-{
-	socket_type = stream
-	protocol    = tcp
-	wait        = no
-	user        = news
-	server      = /usr/sbin/leafnode
-	disable     = yes
-}
--- a/net-nntp/leafnode/files/local.groups	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-local.testing	y	local group for testing
-local.special	m	local group with moderator
--- a/net-nntp/leafnode/files/moderators	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-local.special:root@localhost
--- a/net-nntp/leafnode/files/texpire.cron	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# Uncomment the following if you want to
-# clean up your news spool regularly.
-#
-#
-# This is part of the leafnode package.
-#
-
-#/usr/sbin/texpire
--- a/net-nntp/leafnode/leafnode-2.0.0_alpha20070602.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/leafnode/leafnode-2.0.0_alpha20070108.ebuild,v 1.1 2007/02/18 21:13:31 swegener Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/_/.}a
-
-DESCRIPTION="A USENET software package designed for small sites"
-SRC_URI="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/${MY_P}.tar.bz2"
-HOMEPAGE="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="ipv6 pam"
-
-DEPEND=">=dev-libs/libpcre-3.9
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	virtual/inetd"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--sysconfdir=/etc/leafnode \
-		--with-runas-user=news \
-		--localstatedir=/var \
-		--with-spooldir=/var/spool/news \
-		$(use_with ipv6) \
-		$(use_with pam) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	keepdir \
-		/var/lock/news \
-		/var/lib/news \
-		/var/spool/news
-
-	insinto /etc/leafnode
-	doins "${FILESDIR}"/{local.groups,moderators} || die "doins failed"
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/leafnode.xinetd leafnode-nntp || die "newins failed"
-
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/fetchnews.cron fetchnews || die "doexe failed"
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/texpire.cron texpire || die "doexe failed"
-
-	dodoc \
-		AUTHORS COPYING* CREDITS ChangeLog DEBUGGING ENVIRONMENT \
-		INSTALL NEWS TODO README || die "dodoc failed"
-	dohtml README.html || die "dohtml failed"
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/Manifest	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,11 @@
+AUX squid-3.1.1-gentoo.patch 12340 RMD160 2af977a632d7171e44783cb9d3916acbcbd5cf67 SHA1 a7af51e9dcc13be9447b4d5e2015b8ac6951fc6d SHA256 2306185beba98cc08e2b91edfef4227243c823038f06d4e6bfb90a601649c5c2
+AUX squid-3.1.1-libmd5.patch 600 RMD160 9f2891d87ae97188dc0423ad43449894b068b8ed SHA1 e61a8192f9d3085e7409e4059e4b2444cebf9b36 SHA256 e04ee68b9efea75d4fcd93a9f367c8973ca71308b003d66406cd582eacc0fba8
+AUX squid-3.1.1-qafixes.patch 3074 RMD160 a81372ceb4e55ebac7955ea13aa3e71a0a14b70f SHA1 2bd6f752d00d4bf1942c8f4e9304a60cb709e0d3 SHA256 c6f58b3a117e4901eeaed0571bb245876c658a816602a87036e77bd2793abcfc
+AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec
+AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
+AUX squid.initd 3315 RMD160 a6209a27770eb2aebdd533c946e790efec0de53b SHA1 08519fa20a7286cba9ea82e7b23dd8116ab7f77b SHA256 d3eac36c2fc313688e19cde7ace63783cd202315b23c0b2bd0219a4504cb2b35
+AUX squid.initd-logrotate 3163 RMD160 b7d58517e4198ceb7416c00004c91ac30a241bfb SHA1 714d51e0c449817c12e7230942f89c1a62012107 SHA256 b403b7ffebc08c2ce76cd2b8b6c53a639f24e3e35933ba9766aa4623a34a1279
+AUX squid.logrotate 103 RMD160 e7e4a6bde48e2735632692a6e628955b270f30ad SHA1 6e8d42f6a1a3109f0a26ed30edc7d91c6816e23f SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482
+AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
+DIST squid-3.1.1.tar.gz 3251799 RMD160 3bd04da782a5c4bbee926a058c86c521dfb88502 SHA1 98a6f6ce4f4693793a50be5d1c40b74c42b6eb49 SHA256 310e41f4be17437a7fd8b5bf877f0cd2ff5c7a57706e55860364ffcfcf16692b
+EBUILD squid-3.1.1.ebuild 6817 RMD160 eafec9696634d99bcdc5c1765ba00fdd1504c590 SHA1 277f56f7680220323e98ab2def30dc8a07ad627a SHA256 9578cfa1ce43fe141f3273abcc5d8beaf2871734f2514da8b203ce76da90c680
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid-3.1.1-gentoo.patch	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,281 @@
+diff -Nru squid-3.1.1.orig/acinclude.m4 squid-3.1.1/acinclude.m4
+--- squid-3.1.1.orig/acinclude.m4	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/acinclude.m4	2010-04-15 16:28:17.000000000 +0300
+@@ -75,7 +75,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
+-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.1.1.orig/configure.in squid-3.1.1/configure.in
+--- squid-3.1.1.orig/configure.in	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/configure.in	2010-04-15 16:28:49.000000000 +0300
+@@ -16,9 +16,9 @@
+ PRESET_LDFLAGS="$LDFLAGS"
+
+ dnl Set default LDFLAGS
+-if test -z "$LDFLAGS"; then
+-        LDFLAGS="-g"
+-fi
++dnl if test -z "$LDFLAGS"; then
++dnl         LDFLAGS="-g"
++dnl fi
+
+ dnl Check for GNU cc
+ AC_PROG_CC
+diff -Nru squid-3.1.1.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.1/helpers/basic_auth/MSNT/confload.c
+--- squid-3.1.1.orig/helpers/basic_auth/MSNT/confload.c	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/basic_auth/MSNT/confload.c	2010-04-15 16:29:51.000000000 +0300
+@@ -27,7 +27,7 @@
+
+ /* Path to configuration file */
+ #ifndef SYSCONFDIR
+-#define SYSCONFDIR "/usr/local/squid/etc"
++#define SYSCONFDIR "/etc/squid"
+ #endif
+ #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
+
+diff -Nru squid-3.1.1.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.1/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.1.1.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/basic_auth/MSNT/msntauth.conf.default	2010-04-15 16:30:39.000000000 +0300
+@@ -8,6 +8,6 @@
+ server other_PDC	other_BDC	otherdomain
+
+ # Denied and allowed users. Comment these if not needed.
+-#denyusers	/usr/local/squid/etc/msntauth.denyusers
+-#allowusers	/usr/local/squid/etc/msntauth.allowusers
++#denyusers	/etc/squid/msntauth.denyusers
++#allowusers	/etc/squid/msntauth.allowusers
+
+diff -Nru squid-3.1.1.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.1/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.1.1.orig/helpers/basic_auth/SMB/Makefile.am	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/basic_auth/SMB/Makefile.am	2010-04-15 16:31:23.000000000 +0300
+@@ -16,7 +16,7 @@
+ ## FIXME: autoconf should test for the samba path.
+
+ SMB_AUTH_HELPER	= smb_auth.sh
+-SAMBAPREFIX=/usr/local/samba
++SAMBAPREFIX=/usr
+ SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
+
+ libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
+diff -Nru squid-3.1.1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.1/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.1.1.orig/helpers/basic_auth/SMB/smb_auth.sh	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/basic_auth/SMB/smb_auth.sh	2010-04-15 16:32:48.000000000 +0300
+@@ -24,7 +24,7 @@
+ read AUTHSHARE
+ read AUTHFILE
+ read SMBUSER
+-read SMBPASS
++read -r SMBPASS
+
+ # Find domain controller
+ echo "Domain name: $DOMAINNAME"
+@@ -47,7 +47,7 @@
+   addropt=""
+ fi
+ echo "Query address options: $addropt"
+-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
++dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
+ echo "Domain controller IP address: $dcip"
+ [ -n "$dcip" ] || exit 1
+
+diff -Nru squid-3.1.1.orig/helpers/external_acl/session/squid_session.8 squid-3.1.1/helpers/external_acl/session/squid_session.8
+--- squid-3.1.1.orig/helpers/external_acl/session/squid_session.8	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/external_acl/session/squid_session.8	2010-04-15 16:33:36.000000000 +0300
+@@ -35,7 +35,7 @@
+ .P
+ Configuration example using the default automatic mode
+ .IP
+-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
++external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
+ .IP
+ acl session external session
+ .IP
+diff -Nru squid-3.1.1.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.1/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.1.1.orig/helpers/external_acl/unix_group/squid_unix_group.8	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/external_acl/unix_group/squid_unix_group.8	2010-04-15 16:34:17.000000000 +0300
+@@ -27,7 +27,7 @@
+ This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
+ matches users in group2 or group3
+ .IP
+-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
++external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
+ .IP
+ acl usergroup1 external unix_group group1
+ .IP
+diff -Nru squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-04-15 17:35:20.000000000 +0300
+@@ -17,6 +17,7 @@
+
+ AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
+ AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
++AM_MAINTAINER_MODE
+ AC_CONFIG_SRCDIR([squid_kerb_auth.c])
+
+ AC_PROG_CC
+@@ -467,7 +468,7 @@
+ echo "configure: ##"
+ echo "configure: ## -----------------------------##"
+
+-MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
++MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
+ for ac_cv_my_cflag in $MY_CFLAGS; do
+ echo "int main()
+   {
+diff -Nru squid-3.1.1.orig/lib/libTrie/acinclude.m4 squid-3.1.1/lib/libTrie/acinclude.m4
+--- squid-3.1.1.orig/lib/libTrie/acinclude.m4	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/lib/libTrie/acinclude.m4	2010-04-15 17:35:48.000000000 +0300
+@@ -11,7 +11,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
+-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.1.1.orig/lib/libTrie/configure.in squid-3.1.1/lib/libTrie/configure.in
+--- squid-3.1.1.orig/lib/libTrie/configure.in	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/lib/libTrie/configure.in	2010-04-15 17:36:46.000000000 +0300
+@@ -59,8 +59,8 @@
+
+ dnl set useful flags
+ if test "$GCC" = "yes"; then
+-   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
+-   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
++   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ else
+    TRIE_CFLAGS=
+    TRIE_CXXFLAGS=
+diff -Nru squid-3.1.1.orig/src/Makefile.am squid-3.1.1/src/Makefile.am
+--- squid-3.1.1.orig/src/Makefile.am	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/src/Makefile.am	2010-04-15 17:44:39.000000000 +0300
+@@ -638,7 +638,6 @@
+
+ sysconf_DATA = \
+ 	squid.conf.default \
+-	squid.conf.documented \
+ 	mime.conf.default
+
+ data_DATA = \
+@@ -718,8 +717,8 @@
+ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
+ DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
+ DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
+-DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
+-DEFAULT_SWAP_DIR        = $(localstatedir)/cache
++DEFAULT_NETDB_FILE      = $(localstatedir)/run/netdb.state
++DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
+ DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+@@ -797,13 +796,11 @@
+ 	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+ 	else \
+-	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+-	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
++	        echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
++	        $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
+ 	fi
+-	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
+-	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
+-	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
+-	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
++	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
++	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
+ 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
+
+ uninstall-local: squid.conf.default
+diff -Nru squid-3.1.1.orig/src/cf.data.pre squid-3.1.1/src/cf.data.pre
+--- squid-3.1.1.orig/src/cf.data.pre	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/src/cf.data.pre	2010-04-15 17:39:56.000000000 +0300
+@@ -718,6 +718,7 @@
+ acl Safe_ports port 488		# gss-http
+ acl Safe_ports port 591		# filemaker
+ acl Safe_ports port 777		# multiling http
++acl Safe_ports port 901		# SWAT
+ acl CONNECT method CONNECT
+ NOCOMMENT_END
+ DOC_END
+@@ -867,6 +868,9 @@
+ http_access allow localnet
+ http_access allow localhost
+
++# Allow the localhost to have access by default
++http_access allow localhost
++
+ # And finally deny all other access to this proxy
+ http_access deny all
+ NOCOMMENT_END
+@@ -4037,11 +4041,11 @@
+
+ NAME: cache_mgr
+ TYPE: string
+-DEFAULT: webmaster
++DEFAULT: root
+ LOC: Config.adminEmail
+ DOC_START
+ 	Email-address of local cache manager who will receive
+-	mail if the cache dies.  The default is "webmaster."
++	mail if the cache dies.  The default is "root".
+ DOC_END
+
+ NAME: mail_from
+@@ -6353,7 +6357,7 @@
+ NAME: forwarded_for
+ COMMENT: on|off|transparent|truncate|delete
+ TYPE: string
+-DEFAULT: on
++DEFAULT: delete
+ LOC: opt_forwarded_for
+ DOC_START
+ 	If set to "on", Squid will append your client's IP address
+diff -Nru squid-3.1.1.orig/src/debug.cc squid-3.1.1/src/debug.cc
+--- squid-3.1.1.orig/src/debug.cc	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/src/debug.cc	2010-04-15 17:40:27.000000000 +0300
+@@ -452,7 +452,7 @@
+ #if HAVE_SYSLOG && defined(LOG_LOCAL4)
+
+     if (Debug::log_syslog)
+-        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
++        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
+
+ #endif /* HAVE_SYSLOG */
+
+diff -Nru squid-3.1.1.orig/src/main.cc squid-3.1.1/src/main.cc
+--- squid-3.1.1.orig/src/main.cc	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/src/main.cc	2010-04-15 17:41:34.000000000 +0300
+@@ -1535,7 +1535,7 @@
+     if (*(argv[0]) == '(')
+         return;
+
+-    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
+
+     if ((pid = fork()) < 0)
+         syslog(LOG_ALERT, "fork failed: %s", xstrerror());
+@@ -1579,7 +1579,7 @@
+
+         if ((pid = fork()) == 0) {
+             /* child */
+-            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
+             prog = xstrdup(argv[0]);
+             argv[0] = xstrdup("(squid)");
+             execvp(prog, argv);
+@@ -1587,7 +1587,7 @@
+         }
+
+         /* parent */
+-        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
+
+         syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid-3.1.1-libmd5.patch	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,16 @@
+diff -Nru squid-3.1.0.15.orig/configure.in squid-3.1.0.15/configure.in
+--- squid-3.1.0.15.orig/configure.in	2009-11-23 04:11:00.000000000 +0100
++++ squid-3.1.0.15/configure.in	2009-11-29 09:44:37.000000000 +0100
+@@ -2802,7 +2802,11 @@
+ dnl libcrypt (eg FreeBSD)
+ AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
+ dnl Solaris10 provides MD5 natively through libmd5
+-AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++case "$host" in
++	*-solaris*)
++	    AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++	    ;;
++esac
+ AC_SUBST(CRYPTLIB)
+
+ dnl Check for libdl, used by auth_modules/PAM
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid-3.1.1-qafixes.patch	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,57 @@
+diff -Nru squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-04-15 18:08:18.000000000 +0300
+@@ -93,7 +94,7 @@
+                        else
+                          ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
+                          if test "x$ac_gssapi_libs" != "x" ; then
+-                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                           LIBS="$LIBS $ac_gssapi_libs"
+                          else
+                            for lib in $ac_gss_libs; do
+                              AC_CHECK_LIB($lib,main)
+@@ -117,7 +118,7 @@
+                      fi
+                      ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
+                      if test "x$ac_gssapi_libs" != "x" ; then
+-                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                         LIBS="$LIBS $ac_gssapi_libs"
+                      else
+                          for lib in $ac_gss_libs; do
+                             AC_CHECK_LIB($lib,main)
+@@ -171,7 +172,7 @@
+                              ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
+                              LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
+                            fi
+-                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                           LIBS="$LIBS $ac_gssapi_libs"
+                          else
+                            for lib in $ac_gss_libs; do
+                              AC_CHECK_LIB($lib,main)
+@@ -200,7 +201,7 @@
+                            ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
+                            LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
+                          fi
+-                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                         LIBS="$LIBS $ac_gssapi_libs"
+                      else
+                          for lib in $ac_gss_libs; do
+                             AC_CHECK_LIB($lib,main)
+diff -Nru squid-3.1.1.orig/src/forward.cc squid-3.1.1/src/forward.cc
+--- squid-3.1.1.orig/src/forward.cc	2010-04-15 16:27:19.000000000 +0300
++++ squid-3.1.1/src/forward.cc	2010-04-15 18:19:20.000000000 +0300
+@@ -999,8 +999,12 @@
+                         break;
+
+                     if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) {
+-                        int *tmp = (int*)CMSG_DATA(o);
+-                        clientFde->upstreamTOS = (unsigned char)*tmp;
++                        union {
++                           unsigned char *pchar;
++                           int  *pint;
++                        } data;
++                        data.pchar = CMSG_DATA(o);
++                        clientFde->upstreamTOS = (unsigned char)*data.pint;
+                         break;
+                     }
+                     pbuf += CMSG_LEN(o->cmsg_len);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid.confd	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.3 2009/10/25 08:35:46 mrness Exp $
+
+# Config file for /etc/init.d/squid
+
+SQUID_OPTS="-YC"
+
+# Max. number of filedescriptors to use. You can increase this on a busy
+# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024.
+SQUID_MAXFD=1024
+
+# Kerberos keytab file to use. This is required if you enable kerberos authentication.
+SQUID_KEYTAB=""
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid.cron	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+if test -e /var/run/squid.pid ; then
+	test -n "$(cat /var/run/squid.pid|xargs ps -p|grep squid)" && \
+		/usr/sbin/squid -k rotate
+fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid.initd	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,129 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.13 2009/11/28 12:32:58 mrness Exp $
+
+opts="${opts} reload rotate"
+
+depend() {
+	use dns
+	need net
+}
+
+upprocval() {
+	[ -f $1 ] || return 0
+	if [ `cat $1` -lt $2 ]; then
+		echo $2 > $1
+	fi
+}
+
+# Try to increase the # of filedescriptors we can open.
+maxfds() {
+	[ -n "$SQUID_MAXFD" ] || return
+	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
+	local minimal_file_max=$(($SQUID_MAXFD + 4096))
+	upprocval /proc/sys/fs/file-max $minimal_file_max
+	if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
+		upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
+	fi
+	ulimit -n $SQUID_MAXFD
+}
+
+checkconfig() {
+	if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
+		eerror "You need to create /etc/squid/${SVCNAME}.conf first."
+		eerror "An example can be found in /etc/squid/squid.conf.default"
+		return 1
+	fi
+
+	local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
+	[ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
+	if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
+		eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
+		eerror "   /var/run/${SVCNAME}.pid"
+		eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
+		eerror "         in any other instance of squid."
+		return 1
+	fi
+
+	maxfds
+
+	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
+	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
+
+	local x
+	for x in $CACHE_SWAP ; do
+		if [ ! -e $x ] ; then
+			ebegin "Initializing cache directory ${x%/*}"
+			local ORIG_UMASK=$(umask)
+			umask 027
+
+			if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
+				eend 1
+				return 1
+			fi
+
+			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
+			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
+				umask $ORIG_UMASK
+				eend 1
+				echo "$INIT_CACHE_RESPONSE"
+				return 1
+			fi
+
+			umask $ORIG_UMASK
+			eend 0
+			break
+		fi
+	done
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
+	eend $? && sleep 1
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+		# Now we have to wait until squid has _really_ stopped.
+		sleep 1
+		if [ -f /var/run/${SVCNAME}.pid ] ; then
+			einfon "Waiting for squid to shutdown ."
+			cnt=0
+			while [ -f /var/run/${SVCNAME}.pid ] ; do
+				cnt=$(expr $cnt + 1)
+				if [ $cnt -gt 60 ] ; then
+					# Waited 120 seconds now. Fail.
+					echo
+					eend 1 "Failed."
+					break
+				fi
+				sleep 2
+				echo -n "."
+			done
+			echo
+		fi
+	else
+		eerror "Squid shutdown failed, probably service is already down."
+	fi
+	eend 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME}"
+	/usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
+	eend $?
+}
+
+rotate() {
+	service_started ${SVCNAME} || return 1
+	ebegin "Rotating ${SVCNAME} logs"
+	/usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf
+	eend $?
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid.initd-logrotate	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,122 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.11 2009/11/28 12:32:58 mrness Exp $
+
+opts="${opts} reload"
+
+depend() {
+	use dns
+	need net
+}
+
+upprocval() {
+	[ -f $1 ] || return 0
+	if [ `cat $1` -lt $2 ]; then
+		echo $2 > $1
+	fi
+}
+
+# Try to increase the # of filedescriptors we can open.
+maxfds() {
+	[ -n "$SQUID_MAXFD" ] || return
+	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
+	local minimal_file_max=$(($SQUID_MAXFD + 4096))
+	upprocval /proc/sys/fs/file-max $minimal_file_max
+	if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
+		upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
+	fi
+	ulimit -n $SQUID_MAXFD
+}
+
+checkconfig() {
+	if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
+		eerror "You need to create /etc/squid/${SVCNAME}.conf first."
+		eerror "An example can be found in /etc/squid/squid.conf.default"
+		return 1
+	fi
+
+	local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
+	[ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
+	if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
+		eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
+		eerror "   /var/run/${SVCNAME}.pid"
+		eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
+		eerror "         in any other instance of squid."
+		return 1
+	fi
+
+	maxfds
+
+	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
+	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
+
+	local x
+	for x in $CACHE_SWAP ; do
+		if [ ! -e $x ] ; then
+			ebegin "Initializing cache directory ${x%/*}"
+			local ORIG_UMASK=$(umask)
+			umask 027
+
+			if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
+				eend 1
+				return 1
+			fi
+
+			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
+			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
+				umask $ORIG_UMASK
+				eend 1
+				echo "$INIT_CACHE_RESPONSE"
+				return 1
+			fi
+
+			umask $ORIG_UMASK
+			eend 0
+			break
+		fi
+	done
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
+	eend $? && sleep 1
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+		# Now we have to wait until squid has _really_ stopped.
+		sleep 1
+		if [ -f /var/run/${SVCNAME}.pid ] ; then
+			einfon "Waiting for squid to shutdown ."
+			cnt=0
+			while [ -f /var/run/${SVCNAME}.pid ] ; do
+				cnt=$(expr $cnt + 1)
+				if [ $cnt -gt 60 ] ; then
+					# Waited 120 seconds now. Fail.
+					echo
+					eend 1 "Failed."
+					break
+				fi
+				sleep 2
+				echo -n "."
+			done
+			echo
+		fi
+	else
+		eerror "Squid shutdown failed, probably service is already down."
+	fi
+	eend 0
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME}"
+	/usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
+	eend $?
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid.logrotate	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,8 @@
+/var/log/squid/*.log {
+    copytruncate
+    compress
+    notifempty
+    missingok
+    sharedscripts
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/files/squid.pam	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,8 @@
+#%PAM-1.0
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.3 2007/09/23 09:23:41 mrness Exp $
+auth       required		pam_nologin.so
+auth       include		system-auth
+account    include		system-auth
+password   include		system-auth
+session    optional		pam_limits.so
+session    include		system-auth
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squid/squid-3.1.1.ebuild	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,207 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.15_beta-r1.ebuild,v 1.1 2009/11/29 08:53:09 mrness Exp $
+
+EAPI="2"
+
+inherit eutils pam toolchain-funcs
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client \
+	mysql postgres sqlite \
+	zero-penalty-hit \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux +epoll"
+RESTRICT=test
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/automake
+	sys-devel/autoconf
+	sys-devel/libtool
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+# S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
+		eerror "coss store IO has been disabled by upstream due to stability issues!"
+		eerror "If you want to install this version, switch the store type to something else"
+		eerror "before attempting to install this version again."
+
+		die "/etc/squid/squid.conf: cache_dir use a disabled store type"
+	fi
+
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-qafixes.patch
+	epatch "${FILESDIR}"/${P}-libmd5.patch
+
+	# eautoreconf breaks lib/libLtdl/libtool script
+	./bootstrap.sh || die "autoreconf failed"
+}
+
+src_configure() {
+	local myconf=""
+
+	local basic_modules="getpwnam,NCSA,MSNT"
+	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
+	use ldap && basic_modules="LDAP,${basic_modules}"
+	use pam && basic_modules="PAM,${basic_modules}"
+	use sasl && basic_modules="SASL,${basic_modules}"
+	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
+	use radius && basic_modules="squid_radius_auth,${basic_modules}"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules="DB,${basic_modules}"
+	fi
+
+	local digest_modules="password"
+	use ldap && digest_modules="ldap,${digest_modules}"
+
+	local ext_helpers="ip_user,session,unix_group"
+	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local ntlm_helpers="fakeauth"
+	use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
+
+	local negotiate_helpers=
+	if use kerberos; then
+		negotiate_helpers="squid_kerb_auth"
+		has_version app-crypt/mit-krb5 \
+			&& myconf="--enable-mit --disable-heimdal" \
+			|| myconf="--disable-mit --enable-heimdal"
+	fi
+
+	# coss support has been disabled
+	# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
+	myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
+
+	if use kernel_linux; then
+		myconf="${myconf} --enable-linux-netfilter
+			$(use_enable epoll)"
+	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		myconf="${myconf} $(use_enable kqueue)"
+		if use pf-transparent; then
+			myconf="${myconf} --enable-pf-transparent"
+		elif use ipf-transparent; then
+			myconf="${myconf} --enable-ipf-transparent"
+		fi
+	fi
+
+	export CC=$(tc-getCC)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/var/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-auth="basic,digest,negotiate,ntlm" \
+		--enable-removal-policies="lru,heap" \
+		--enable-digest-auth-helpers="${digest_modules}" \
+		--enable-basic-auth-helpers="${basic_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-arp-acl \
+		--with-large-files \
+		--with-filedescriptors=8192 \
+		--disable-strict-error-checking \
+		$(use_enable caps) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		$(use_enable zero-penalty-hit zph-qos) \
+		${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/ncsa_auth
+	fowners root:squid /usr/libexec/squid/pam_auth
+	fperms 4750 /usr/libexec/squid/ncsa_auth
+	fperms 4750 /usr/libexec/squid/pam_auth
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
+		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
+	newdoc helpers/basic_auth/SMB/README README.auth_smb
+	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
+	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
+	doman helpers/basic_auth/LDAP/*.8
+	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	rm -rf "${D}"/var
+	diropts -m0755 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Squid authentication helpers have been installed suid root."
+	ewarn "This allows shadow based authentication (see bug #52977 for more)."
+	echo
+	ewarn "Be careful what type of cache_dir you select!"
+	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
+	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
+	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
+	echo
+	ewarn "Squid can be configured to run in transparent mode like this:"
+	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
+	if use zero-penalty-hit; then
+		echo
+		ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel"
+		ewarn "with the patch that can be found on http://zph.bratcheda.org site."
+	fi
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squirm/Manifest	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,4 @@
+AUX squirm-1.26-gentoo.patch 1085 RMD160 b40dd89df86af92601f1e29d6f86eaa16df43d8a SHA1 5bb5c0c7310ce2acdabe0ee1f45bf65bd092aabc SHA256 04c16affd099d7f0f8da4133c3ab9c4cc595b8e86c9011622b778384540c3d34
+DIST squirm-1.26.tgz 24151 RMD160 210b634b63caf4f5ca18f9c1e9afaf906e4b74f4 SHA1 ac65ed7d568afac01c572304d2dd25f5360fb764 SHA256 0ff1521b8070f0e8e376d9857a34eb38953992a1f90e25769a5d7c7fe66cff88
+EBUILD squirm-1.26.ebuild 758 RMD160 16acf8dec84bc2e62b85751e6416962ca104a6b1 SHA1 2e058a3d0501a2bb881f43820855e649b4f4e354 SHA256 c67f4ceee19b9278a2472fd95c74965780504bc6d9a0e8f07d7db13fb70e4d7e
+MISC metadata.xml 220 RMD160 b3959b1e5e7257f851583e0a0ff6db0f4a0a0112 SHA1 f10e7f86649ceb749be2d1b105ed621c421b9cef SHA256 15ffb93c241bd710f5731f55fed5b3b621195e9e0a55a220de6a84aef7e2ab8e
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squirm/files/squirm-1.26-gentoo.patch	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,34 @@
+diff -Nru squirm-1.26.orig/Makefile squirm-1.26/Makefile
+--- squirm-1.26.orig/Makefile	2005-08-19 09:31:06.000000000 +0200
++++ squirm-1.26/Makefile	2009-06-20 14:58:18.000000000 +0200
+@@ -1,7 +1,7 @@
+ # $Id: squirm-1.26-gentoo.patch,v 1.1 2009/06/20 13:15:30 mrness Exp $
+
+ # The path to install squirm under
+-PREFIX=/usr/local/squirm
++PREFIX=/opt/squirm
+
+ # The username that squid runs as (see cache_effective_user in squid.conf)
+ USER=squid
+@@ -29,10 +29,10 @@
+ CC=gcc
+
+
+-OPTIMISATION=-O3
++OPTIMISATION=-g
+ BINARIES = squirm
+
+-CFLAGS = -O3 -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\"
++CFLAGS=-g -DPREFIX=\"$(PREFIX)\"
+ #CFLAGS = -Wall -g -DPREFIX=\"$(PREFIX)\"
+ #CFLAGS = -Wall -g -DDEBUG
+
+@@ -45,7 +45,7 @@
+ 			install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/logs
+ 			install -m 660 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \
+ 			$(PREFIX)/etc
+-			install -m 755 -o root -g $(ROOT_GROUP) --strip squirm $(PREFIX)/bin
++			install -m 755 -o root -g $(ROOT_GROUP)  squirm $(PREFIX)/bin
+
+ squirm.o:	squirm.c $(HFILES)
+ 			$(CC) -c squirm.c 	$(CFLAGS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squirm/metadata.xml	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-proxy</herd>
+<longdescription>A redirector for Squid</longdescription>
+</pkgmetadata>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-proxy/squirm/squirm-1.26.ebuild	Tue Apr 27 14:21:11 2010 +0200
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/squirm-1.26.ebuild,v 1.1 2009/06/20 13:15:30 mrness Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A redirector for Squid"
+HOMEPAGE="http://squirm.foote.com.au"
+SRC_URI="http://squirm.foote.com.au/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	emake PREFIX="${D}/opt/squirm" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	einfo "To enable squirm, add the following lines to /etc/squid/squid.conf:"
+	einfo "    url_rewrite_program /opt/squirm/bin/squirm"
+	einfo "    url_rewrite_children 10"
+}
--- a/profiles/repo_name	Sun Mar 21 07:22:03 2010 +0100
+++ b/profiles/repo_name	Tue Apr 27 14:21:11 2010 +0200
@@ -1,1 +1,1 @@
-local-repository
+local
--- a/virtual/postgresql-base/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EBUILD postgresql-base-8.4.ebuild 551 RMD160 84bff8adca5eabdad72f69d06a6f5339e388a398 SHA1 cc54778a2d4923c5291ddaf31be363a2b095cb29 SHA256 d2649b8bf042b8cacdcab4748fe6dfe52380cf795b8fda28b04987fc71dfad8d
-MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
--- a/virtual/postgresql-base/metadata.xml	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>postgresql</herd>
-</pkgmetadata>
--- a/virtual/postgresql-base/postgresql-base-8.4.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.3.ebuild,v 1.3 2009/05/03 11:55:40 armin76 Exp $
-
-EAPI="1"
-
-DESCRIPTION="Virtual for PostgreSQL base (clients + libraries)"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )"
--- a/virtual/postgresql-server/Manifest	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EBUILD postgresql-server-8.4.ebuild 540 RMD160 73f13a3a927bf285f197dc66f6c6434adff23ef8 SHA1 b6a4cf82a520cf9ffe4de26094a2fc66da8fc9bc SHA256 9799e24f6530b49356a31f15fac2d34b2f62dba8ad733d393af436efb9eff80e
-MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
--- a/virtual/postgresql-server/metadata.xml	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>postgresql</herd>
-</pkgmetadata>
--- a/virtual/postgresql-server/postgresql-server-8.4.ebuild	Sun Mar 21 07:22:03 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.3.ebuild,v 1.2 2008/05/19 07:13:12 dev-zero Exp $
-
-EAPI="1"
-
-DESCRIPTION="Virtual for PostgreSQL libraries"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"