Mercurial > hg > portage

changeset 296:fd979fb28c28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delete old ebuild
author holger
date Sat, 10 Sep 2011 21:00:21 +0200
parents 002a7080cbc3
children 8b998225e97a
files dev-db/postgresql-base/Manifest dev-db/postgresql-base/files/postgresql-9.0-base.3.patch dev-db/postgresql-base/files/postgresql-9.0-common.3.patch dev-db/postgresql-base/metadata.xml dev-db/postgresql-base/postgresql-base-9.0.2.ebuild dev-db/postgresql-server/Manifest dev-db/postgresql-server/files/postgresql-9.0-common.3.patch dev-db/postgresql-server/files/postgresql-9.0-server.3.patch dev-db/postgresql-server/files/postgresql.conf-9.0-r1 dev-db/postgresql-server/files/postgresql.init-9.0-r1 dev-db/postgresql-server/metadata.xml dev-db/postgresql-server/postgresql-server-9.0.2.ebuild dev-libs/ossp-uuid/Manifest dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch dev-libs/ossp-uuid/ossp-uuid-1.6.2.ebuild net-proxy/squid/Manifest net-proxy/squid/files/squid-3.1.10-gentoo.patch net-proxy/squid/files/squid.confd net-proxy/squid/files/squid.cron net-proxy/squid/files/squid.initd net-proxy/squid/files/squid.initd-logrotate net-proxy/squid/files/squid.logrotate net-proxy/squid/files/squid.pam net-proxy/squid/squid-3.1.10.ebuild
diffstat 24 files changed, 0 insertions(+), 1962 deletions(-) [+]
line wrap: on
line diff
--- a/dev-db/postgresql-base/Manifest	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-AUX postgresql-9.0-base.3.patch 4961 RMD160 2c9d53ddfeab3fb162c1423e362ae01f54318089 SHA1 9a285971587eca1733d441b2440804dd12597979 SHA256 35c555da25ae4a5e4d00ce74a0130e140e70ed23d12f526bef06c866fdd78362
-AUX postgresql-9.0-common.3.patch 782 RMD160 b826f93738443d7330752babf838b3706351f921 SHA1 af928e62ccd161366e3f6fccf8b47eeb4f4ae1dd SHA256 0339ed502e035330feb62e66927804a1b7506163cb584a152abdd2987f210d33
-DIST postgresql-9.0.2.tar.bz2 14024244 RMD160 3313b4bafe3af6282f68f198da7d50af4d5c01c4 SHA1 42a9518a2f11fa1d09a23bc628b00e992d3bcf4a SHA256 ffb58195850aa0ec9b7b3dcdac51a6dee0c76ea3387b76c805e1c4d186fe2af5
-EBUILD postgresql-base-9.0.2.ebuild 4488 RMD160 316b1cba8990ae6b8617058474ab4e1c0b9b5b98 SHA1 04ff208b7b0de70eeab5f32e11c0120c2801f67d SHA256 fc7279089b216ad47a2b8edec31fcf594bc2ec4d520646dab0e460cced5f6d63
-MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c
--- a/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-diff -Naur postgresql-9.0beta3.orig/contrib/Makefile postgresql-9.0beta3/contrib/Makefile
---- postgresql-9.0beta3.orig/contrib/Makefile	2010-06-14 12:17:56.000000000 -0400
-+++ postgresql-9.0beta3/contrib/Makefile	2010-07-11 23:41:57.680531730 -0400
-@@ -5,51 +5,14 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		auto_explain	\
--		btree_gin	\
--		btree_gist	\
--		chkpass		\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		isn		\
--		lo		\
--		ltree		\
- 		oid2name	\
--		pageinspect	\
- 		passwordcheck	\
--		pg_archivecleanup \
--		pg_buffercache	\
--		pg_freespacemap \
--		pg_standby	\
--		pg_stat_statements \
--		pg_trgm		\
- 		pg_upgrade	\
- 		pg_upgrade_support \
- 		pgbench		\
--		pgcrypto	\
--		pgrowlocks	\
--		pgstattuple	\
--		seg		\
--		spi		\
--		tablefunc	\
--		test_parser	\
--		tsearch2	\
- 		unaccent	\
- 		vacuumlo
- 
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--endif
--
- ifeq ($(with_ossp_uuid),yes)
- SUBDIRS += uuid-ossp
- endif
-diff -Naur postgresql-9.0beta3.orig/src/backend/Makefile postgresql-9.0beta3/src/backend/Makefile
---- postgresql-9.0beta3.orig/src/backend/Makefile	2010-07-05 14:54:37.000000000 -0400
-+++ postgresql-9.0beta3/src/backend/Makefile	2010-07-11 23:46:58.347527452 -0400
-@@ -45,7 +45,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -114,7 +114,7 @@
- endif # aix
- 
- # Update the commonly used headers before building the subdirectories
--$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
-+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
- # run this unconditionally to avoid needing to know its dependencies here:
- submake-schemapg:
-@@ -191,23 +191,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur postgresql-9.0beta3.orig/src/bin/Makefile postgresql-9.0beta3/src/bin/Makefile
---- postgresql-9.0beta3.orig/src/bin/Makefile	2010-01-02 11:57:58.000000000 -0500
-+++ postgresql-9.0beta3/src/bin/Makefile	2010-07-11 23:50:10.762585482 -0400
-@@ -13,8 +13,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+SUBDIRS = pg_dump psql scripts pg_config
- ifeq ($(PORTNAME), win32)
- SUBDIRS+=pgevent
- endif
-diff -Naur postgresql-9.0beta3.orig/src/include/pg_config_manual.h postgresql-9.0beta3/src/include/pg_config_manual.h
---- postgresql-9.0beta3.orig/src/include/pg_config_manual.h	2010-01-06 23:53:35.000000000 -0500
-+++ postgresql-9.0beta3/src/include/pg_config_manual.h	2010-07-11 23:51:39.925527262 -0400
-@@ -141,7 +141,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.0beta3.orig/src/Makefile postgresql-9.0beta3/src/Makefile
---- postgresql-9.0beta3.orig/src/Makefile	2010-01-20 04:16:23.000000000 -0500
-+++ postgresql-9.0beta3/src/Makefile	2010-07-11 23:53:43.768528995 -0400
-@@ -15,17 +15,12 @@
- 
- all install installdirs uninstall distprep:
- 	$(MAKE) -C port $@
--	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C backend/snowball $@
- 	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C backend/replication/libpqwalreceiver $@
- 	$(MAKE) -C bin $@
--	$(MAKE) -C pl $@
- 	$(MAKE) -C makefiles $@
--	$(MAKE) -C test/regress $@
- 
- install: install-local
- 
--- a/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in
---- postgresql-9.0beta3.orig/configure.in	2010-07-08 22:43:12.000000000 -0400
-+++ postgresql-9.0beta3/configure.in	2010-07-12 00:13:37.585527031 -0400
-@@ -19,10 +19,6 @@
- 
- AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
--- a/dev-db/postgresql-base/metadata.xml	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>postgresql</herd>
-<use>
-  <flag name='pg-intdatetime'>Enable --enable-integer-datetimes configure
-  option, which changes PG to use 64-bit integers for timestamp storage</flag>
-  <flag name='pg_legacytimestamp'>Use double precision floating-point numbers
-    instead of 64-bit integers for timestamp storage.
-  </flag>
-
-</use>
-</pkgmetadata>
--- a/dev-db/postgresql-base/postgresql-base-9.0.2.ebuild	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.1.ebuild,v 1.1 2010/10/06 14:57:13 patrick Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib versionator autotools
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-
-MY_PV=${PV/_/}
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-S=${WORKDIR}/postgresql-${MY_PV}
-
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-RESTRICT="test"
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="!!dev-db/postgresql-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	readline? ( sys-libs/readline )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-9.0-common.3.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.3.patch"
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf \
-		--prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--docdir=/usr/share/doc/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h || die
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/ || die
-	cp  "${S}"/doc/src/sgml/man1/* "${D}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template} || die
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT} || die
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
-LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-MANPATH=/usr/share/postgresql-${SLOT}/man
-__EOF__
-	doenvd "${T}/50postgresql-94-${SLOT}" || die
-
-	keepdir /etc/postgresql-${SLOT} || die
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    '${ROOT}/etc/postgresql-${SLOT}/'"
-	elog
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
--- a/dev-db/postgresql-server/Manifest	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-AUX postgresql-9.0-common.3.patch 782 RMD160 b826f93738443d7330752babf838b3706351f921 SHA1 af928e62ccd161366e3f6fccf8b47eeb4f4ae1dd SHA256 0339ed502e035330feb62e66927804a1b7506163cb584a152abdd2987f210d33
-AUX postgresql-9.0-server.3.patch 8076 RMD160 03883f576e9307876fa47236b498f0dd9e833d8f SHA1 bc640b3bafff25d21bb1f274b3e1d05bc00bc474 SHA256 0e0c13d3cea708dc5d512a53ace1b77ff3c94f2cde98815e417cc2fba70481c7
-AUX postgresql.conf-9.0-r1 1691 RMD160 752a860bf07f4bc0b340179d460a965aa6908820 SHA1 13b1c810e402bc67b940b721bde7872f6ec078ed SHA256 389c104d73647b9e9199d93836f8b38c280a844e3e1f1d39552871be0023b7bd
-AUX postgresql.init-9.0-r1 3861 RMD160 f8c9a1d874e81932e6df6dcb0c68287dad68d44f SHA1 ac761e2b0d95e5d87422f8552427987363fd8894 SHA256 707a65b4fe1b5f379a7fc865c81e9ba083b4dab0dab8652c2fbe1174a1fc7c46
-DIST postgresql-9.0.2.tar.bz2 14024244 RMD160 3313b4bafe3af6282f68f198da7d50af4d5c01c4 SHA1 42a9518a2f11fa1d09a23bc628b00e992d3bcf4a SHA256 ffb58195850aa0ec9b7b3dcdac51a6dee0c76ea3387b76c805e1c4d186fe2af5
-EBUILD postgresql-server-9.0.2.ebuild 10183 RMD160 5f255d1dfea7a0f9552dcad297120a4c3033bbe4 SHA1 a6b66a74c613e8f51fb31fb1f7dfff20bd6c68f7 SHA256 48896f6c81687bb650bffb309dd4502f7a005b380a34e2277b9ff330d528cc25
-MISC metadata.xml 420 RMD160 789f5a0ce45d05125098fd7e74a816cf08f4c39b SHA1 d308d7434a37f12cd320f74ed85e1d3ca7dabc75 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62
--- a/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in
---- postgresql-9.0beta3.orig/configure.in	2010-07-08 22:43:12.000000000 -0400
-+++ postgresql-9.0beta3/configure.in	2010-07-12 00:13:37.585527031 -0400
-@@ -19,10 +19,6 @@
- 
- AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
--- a/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-diff -Naur postgresql-9.0beta3.orig/contrib/adminpack/Makefile postgresql-9.0beta3/contrib/adminpack/Makefile
---- postgresql-9.0beta3.orig/contrib/adminpack/Makefile	2007-11-10 18:59:50.000000000 -0500
-+++ postgresql-9.0beta3/contrib/adminpack/Makefile	2010-07-12 08:41:54.894528045 -0400
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- OBJS = adminpack.o
-diff -Naur postgresql-9.0beta3.orig/contrib/dblink/Makefile postgresql-9.0beta3/contrib/dblink/Makefile
---- postgresql-9.0beta3.orig/contrib/dblink/Makefile	2007-11-10 18:59:50.000000000 -0500
-+++ postgresql-9.0beta3/contrib/dblink/Makefile	2010-07-12 08:41:54.894528045 -0400
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = dblink
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir)  -I../../src/include/
- OBJS	= dblink.o
- SHLIB_LINK = $(libpq)
- 
-diff -Naur postgresql-9.0beta3.orig/contrib/Makefile postgresql-9.0beta3/contrib/Makefile
---- postgresql-9.0beta3.orig/contrib/Makefile	2010-06-14 12:17:56.000000000 -0400
-+++ postgresql-9.0beta3/contrib/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -23,18 +23,13 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pageinspect	\
--		passwordcheck	\
- 		pg_archivecleanup \
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_standby	\
- 		pg_stat_statements \
- 		pg_trgm		\
--		pg_upgrade	\
--		pg_upgrade_support \
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
-@@ -42,9 +37,7 @@
- 		spi		\
- 		tablefunc	\
- 		test_parser	\
--		tsearch2	\
--		unaccent	\
--		vacuumlo
-+		tsearch2
- 
- ifeq ($(with_openssl),yes)
- SUBDIRS += sslinfo
-diff -Naur postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.0beta3/contrib/uuid-ossp/Makefile
---- postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile	2007-11-12 19:13:19.000000000 -0500
-+++ postgresql-9.0beta3/contrib/uuid-ossp/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -1,11 +1,13 @@
- # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
- 
-+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
- MODULE_big = uuid-ossp
- OBJS = uuid-ossp.o
- DATA_built = uuid-ossp.sql
- DATA = uninstall_uuid-ossp.sql
- 
--SHLIB_LINK += $(OSSP_UUID_LIBS)
-+SHLIB_LINK += -lossp-uuid
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
-diff -Naur postgresql-9.0beta3.orig/contrib/xml2/Makefile postgresql-9.0beta3/contrib/xml2/Makefile
---- postgresql-9.0beta3.orig/contrib/xml2/Makefile	2010-03-01 13:07:59.000000000 -0500
-+++ postgresql-9.0beta3/contrib/xml2/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -4,7 +4,8 @@
- 
- OBJS = xpath.o xslt_proc.o
- 
--SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
-+PG_CPPFLAGS = $(shell xml2-config --cflags)
-+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
- 
- DATA_built = pgxml.sql
- DATA = uninstall_pgxml.sql
-diff -Naur postgresql-9.0beta3.orig/GNUmakefile.in postgresql-9.0beta3/GNUmakefile.in
---- postgresql-9.0beta3.orig/GNUmakefile.in	2010-03-29 20:10:46.000000000 -0400
-+++ postgresql-9.0beta3/GNUmakefile.in	2010-07-12 08:41:54.895528185 -0400
-@@ -10,7 +10,6 @@
- 
- all:
- 	$(MAKE) -C src all
--	$(MAKE) -C config all
- 	@echo "All of PostgreSQL successfully made. Ready to install."
- 
- docs:
-@@ -28,7 +27,6 @@
- 
- install:
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 	@echo "PostgreSQL installation complete."
- 
- install-docs:
-@@ -44,7 +42,6 @@
- installdirs uninstall coverage:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 
- distprep:
- 	$(MAKE) -C doc $@
-diff -Naur postgresql-9.0beta3.orig/src/bin/initdb/Makefile postgresql-9.0beta3/src/bin/initdb/Makefile
---- postgresql-9.0beta3.orig/src/bin/initdb/Makefile	2010-07-05 14:54:37.000000000 -0400
-+++ postgresql-9.0beta3/src/bin/initdb/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -16,7 +16,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-diff -Naur postgresql-9.0beta3.orig/src/bin/Makefile postgresql-9.0beta3/src/bin/Makefile
---- postgresql-9.0beta3.orig/src/bin/Makefile	2010-01-02 11:57:58.000000000 -0500
-+++ postgresql-9.0beta3/src/bin/Makefile	2010-07-12 08:41:54.896527913 -0400
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+SUBDIRS = initdb pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- SUBDIRS+=pgevent
- endif
-diff -Naur postgresql-9.0beta3.orig/src/include/pg_config_manual.h postgresql-9.0beta3/src/include/pg_config_manual.h
---- postgresql-9.0beta3.orig/src/include/pg_config_manual.h	2010-01-06 23:53:35.000000000 -0500
-+++ postgresql-9.0beta3/src/include/pg_config_manual.h	2010-07-12 08:41:54.896527913 -0400
-@@ -141,7 +141,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.0beta3.orig/src/Makefile postgresql-9.0beta3/src/Makefile
---- postgresql-9.0beta3.orig/src/Makefile	2010-01-20 04:16:23.000000000 -0500
-+++ postgresql-9.0beta3/src/Makefile	2010-07-12 08:41:54.896527913 -0400
-@@ -19,15 +19,11 @@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C backend/snowball $@
--	$(MAKE) -C include $@
--	$(MAKE) -C interfaces $@
--	$(MAKE) -C backend/replication/libpqwalreceiver $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-9.0beta3.orig/src/Makefile.global.in postgresql-9.0beta3/src/Makefile.global.in
---- postgresql-9.0beta3.orig/src/Makefile.global.in	2010-07-06 18:03:05.000000000 -0400
-+++ postgresql-9.0beta3/src/Makefile.global.in	2010-07-12 08:41:54.897527811 -0400
-@@ -458,6 +458,7 @@
-    LDFLAGS += $(PROFILE)
- endif
- 
-+CFLAGS += -I${top_srcdir}/src/include
- 
- ##########################################################################
- #
-diff -Naur postgresql-9.0beta3.orig/src/port/Makefile postgresql-9.0beta3/src/port/Makefile
---- postgresql-9.0beta3.orig/src/port/Makefile	2010-07-02 13:03:30.000000000 -0400
-+++ postgresql-9.0beta3/src/port/Makefile	2010-07-12 08:41:54.898529044 -0400
-@@ -39,11 +39,10 @@
- # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
- OBJS_SRV = $(OBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(MKDIR_P) '$(DESTDIR)$(libdir)'
-diff -Naur postgresql-9.0beta3.orig/src/test/regress/GNUmakefile postgresql-9.0beta3/src/test/regress/GNUmakefile
---- postgresql-9.0beta3.orig/src/test/regress/GNUmakefile	2010-07-05 14:54:38.000000000 -0400
-+++ postgresql-9.0beta3/src/test/regress/GNUmakefile	2010-07-12 08:41:54.898529044 -0400
-@@ -141,7 +141,7 @@
- pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE)
- 
- check: all
--	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
-+	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule
--- a/dev-db/postgresql-server/files/postgresql.conf-9.0-r1	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/9.0/data"
-
-# Options to pass to PostgreSQL's initdb.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
-
-# PostgreSQL User
-PGUSER="postgres"
-
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of
-# these options can be set directly in the configuration file.
-#PGOPTS="-N 512 -B 1024"
-
-# Allow *_TIMEOUT to run its course.
-# Can be overriden by changing to '-W' (capital W)
-WAIT_FOR_START="-w"
-WAIT_FOR_STOP="-w"
-
-# How long to wait for server to start in seconds
-START_TIMEOUT=60
-
-# Ignore new connections and wait for clients to disconnect from server before
-# shutting down.
-# Set NICE_QUIT to "NO" to disable. NICE_TIMEOUT in seconds.
-NICE_QUIT="YES"
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminating a client results in a rollback of open
-# transactions for that client.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to yes and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
--- a/dev-db/postgresql-server/files/postgresql.init-9.0-r1	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-9.0-r1,v 1.1 2010/06/04 14:18:52 patrick Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-	if [ -L /etc/eselect/postgresql/service ] ; then 
-		local p_service="$(for f in /etc/eselect/postgresql/service/* ; do . $f ; done ; echo $postgres_service )"
-		test "${p_service}" = "${SVCNAME}" && provide postgresql
-	fi
-}
-
-checkconfig() {
-	if [ ! -d "$PGDATA" ] ; then
-		eerror "Directory not found: $PGDATA"
-		eerror "Please make sure that PGDATA points to the right path."
-		eerror "You can run 'emerge postgresql-server --config' to setup a new database cluster."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-
-	if [ -f "$PGDATA/postmaster.pid" ] ; then
-		rm -f "$PGDATA/postmaster.pid"
-	fi
-
-	local retval
-
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl start ${WAIT_FOR_START} -t ${START_TIMEOUT} -s -o '--silent-mode=true ${PGOPTS}'"
-	retval=$?
-
-	if [[ $retval != 0 ]] ; then
-		eend $retval
-		return $retval
-	fi
-
-# The following is to catch the case of an already running server
-# in which pg_ctl doesn't know to which server it connected to and
-# falsely reports the server as 'up'
-	sleep 2
-	if [ ! -f "$PGDATA/postmaster.pid" ] ; then
-		eerror "The PID file doesn't exist but pg_ctl reported a running server."
-		eerror "Please check whether there is another server running on the same port or read the log-file."
-		eend 1
-		return 1
-	fi
-
-	local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid")
-	ps -p "${pid}" &> /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL (this can take up to $(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} )) seconds)"
-
-	local retval
-
-	if [[ "${NICE_QUIT}" != "NO" ]] ; then
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${NICE_TIMEOUT} -s -m smart"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-	
-		ewarn "Shutting down the server gracefully failed."
-		ewarn "Probably because some clients did not disconnect within ${NICE_TIMEOUT} seconds."
-	else
-		ewarn "NICE_QUIT disabled."
-		ewarn "You really should have it enabled."
-	fi
-
-	if [[ "${RUDE_QUIT}" != "NO" ]] ; then
-		ewarn "RUDE_QUIT enabled."
-		ewarn "Going to shutdown the server anyway."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${RUDE_TIMEOUT} -s -m fast"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Failed to shutdown server."
-	else
-		ewarn "RUDE_QUIT disabled."
-	fi
-
-	if [[ "${FORCE_QUIT}" == "YES" ]] ; then
-		ewarn "FORCE_QUIT enabled."
-		ewarn "Forcing server to shutdown."
-		ewarn "A recover-run will be executed on the next startup."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${FORCE_TIMEOUT} -s -m immediate"
-
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			ewarn "Server forced down."
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Forced shutdown failed!!!"
-		eerror "Something is wrong with your system."
-		eerror "Please take care of it manually."
-		eerror "Unable to stop server."
-		eend $retval
-		return $retval
-	else
-		ewarn "FORCE_QUIT disabled."
-		eerror "Unable to shutdown server."
-		eend 1
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl reload -s"
-	eend $?
-}
--- a/dev-db/postgresql-server/metadata.xml	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>postgresql</herd>
-<use>
-  <flag name='uuid'>Enable server side UUID generation
-    (via <pkg>dev-libs/ossp-uuid</pkg>)</flag>
-  <flag name='pg_legacytimestamp'>Use double precision floating-point numbers
-    instead of 64-bit integers for timestamp storage.
-  </flag>
-</use>
-</pkgmetadata>
--- a/dev-db/postgresql-server/postgresql-server-9.0.2.ebuild	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.1.ebuild,v 1.1 2010/10/06 14:58:10 patrick Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2"
-
-# weird test failures.
-RESTRICT="test"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib python versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-
-MY_PV=${PV/_/}
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-S=${WORKDIR}/postgresql-${MY_PV}
-
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls perl pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.3.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.3.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--disable-thread-safety \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="/usr/share/zoneinfo" \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp to"
-	ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the"
-	ewarn "socket. This can break applications which have the standard location"
-	ewarn "hard-coded. If such an application links against the libpq, please reemerge"
-	ewarn "it. If that doesn't help or the application accesses the socket without using"
-	ewarn "libpq, please file a bug-report."
-	ewarn
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the"
-	ewarn "original location."
-	ewarn
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale and character encoding in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	elog "default. You can disable it in the cluster's postgresql.conf."
-	elog
-	elog "The timestamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload or enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS"
-	einfo "variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by"
-	einfo "setting the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check  || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
--- a/dev-libs/ossp-uuid/Manifest	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-AUX ossp-uuid-1.6.2-gentoo.patch 4777 RMD160 ce76189a2bcb1d4b1e9293a6c1be39ce6327d4b3 SHA1 0a64f4b85b9c3433ec5ae09aede129040cca4771 SHA256 4b51299cab73dec10500b2114a5993532a6358686c643d5ae9b9d7e7ff0e211c
-DIST uuid-1.6.2.tar.gz 397048 RMD160 f9cd513577557c4f1d7de869f80035b8844b56d7 SHA1 3e22126f0842073f4ea6a50b1f59dcb9d094719f SHA256 11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0
-EBUILD ossp-uuid-1.6.2.ebuild 1608 RMD160 0d3b4385d25df82923d5f4560a3919eefd6eaaa0 SHA1 a4c216b02e1be39d618a44d7dfd14df2e5372572 SHA256 931712a9d9ce2dbcef56d3fe94bf2d419afd8de0f7e8768088779ab85b6b8db0
--- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-diff -Naur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
---- uuid-1.6.2.orig/Makefile.in	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/Makefile.in	2009-03-21 12:53:54.201971177 +0100
-@@ -62,13 +62,13 @@
- PHP         = @PHP@
- PG_CONFIG   = @PG_CONFIG@
- 
--LIB_NAME    = libuuid.la
-+LIB_NAME    = libossp-uuid.la
- LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
- 
--DCE_NAME    = libuuid_dce.la
-+DCE_NAME    = libossp-uuid_dce.la
- DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
- 
--CXX_NAME    = libuuid++.la
-+CXX_NAME    = libossp-uuid++.la
- CXX_OBJS    = uuid++.lo $(LIB_OBJS)
- 
- PRG_NAME    = uuid
-@@ -112,15 +112,15 @@
- 	@$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
- 
- $(LIB_NAME): $(LIB_OBJS)
--	@$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
-+	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
- 	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
- 
- $(DCE_NAME): $(DCE_OBJS)
--	@$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
-+	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
- 	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
- 
- $(CXX_NAME): $(CXX_OBJS)
--	@$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
-+	@$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
- 	    -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
- 
- $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)
-@@ -253,7 +253,7 @@
- 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
- 	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
- 	fi
--	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
-+	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/
- 	$(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
- 	-@if [ ".$(WITH_PERL)" = .yes ]; then \
- 	    (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
-diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4
---- uuid-1.6.2.orig/php/config.m4	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/config.m4	2009-03-21 12:53:06.282809038 +0100
-@@ -33,10 +33,10 @@
- if test "$PHP_UUID" != "no"; then
-     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
-     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
--    PHP_ADD_LIBPATH([..], )
--    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
-     PHP_ADD_INCLUDE([..])
-     PHP_SUBST(UUID_SHARED_LIBADD)
-+    LDFLAGS="$LDFLAGS -L../.libs"
- 
-     dnl  avoid linking conflict with a potentially existing uuid_create(3) in libc
-     AC_CHECK_FUNC(uuid_create,[
-diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local
---- uuid-1.6.2.orig/php/Makefile.local	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/Makefile.local	2009-03-21 12:53:06.282809038 +0100
-@@ -42,7 +42,7 @@
- 
- test: build
- 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \
--	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version
-+	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version
- 
- install: build
- 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
-diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts
---- uuid-1.6.2.orig/php/uuid.ts	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/uuid.ts	2009-03-21 12:53:06.282809038 +0100
-@@ -36,7 +36,7 @@
- 
- print "++ loading DSO uuid.so (low-level API)\n";
- if (!extension_loaded('uuid')) {
--    dl('modules/uuid.so');
-+    dl('uuid.so');
- }
- 
- print "++ loading PHP uuid.php${php_version} (high-level API)\n";
-diff -Naur uuid-1.6.2.orig/uuid-config.in uuid-1.6.2/uuid-config.in
---- uuid-1.6.2.orig/uuid-config.in	2009-03-21 12:52:49.146166177 +0100
-+++ uuid-1.6.2/uuid-config.in	2009-03-21 12:53:06.282809038 +0100
-@@ -121,7 +121,7 @@
-             output_extra="$output_extra $uuid_ldflags"
-             ;;
-         --libs)
--            output="$output -luuid"
-+            output="$output -lossp-uuid"
-             output_extra="$output_extra $uuid_libs"
-             ;;
-         * )
-diff -Naur uuid-1.6.2.orig/uuid.pc.in uuid-1.6.2/uuid.pc.in
---- uuid-1.6.2.orig/uuid.pc.in	2009-03-21 12:52:49.146166177 +0100
-+++ uuid-1.6.2/uuid.pc.in	2009-03-21 12:53:06.282809038 +0100
-@@ -36,7 +36,7 @@
- Description: Universally Unique Identifier (UUID) Library
- Version: @UUID_VERSION_RAW@
- URL: http://www.ossp.org/pkg/lib/uuid/
--Cflags: -I${includedir}
--Libs: -L${libdir} -luuid
-+Cflags: -I${includedir}/ossp
-+Libs: -L${libdir} -lossp-uuid
- Libs.private: @LIBS@
- 
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2.ebuild	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2.ebuild,v 1.8 2010/04/25 20:14:06 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_P="uuid-${PV}"
-
-DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID."
-HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="+cxx"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	# Notes:
-	# * collides with e2fstools libs and includes if not moved around
-	# * perl-bindings are broken
-	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
-	econf \
-		--includedir=/usr/include/ossp \
-		--with-dce \
-		--without-pgsql \
-		--without-perl \
-		--without-php \
-		$(use_with cxx) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS
-
-	mv "${D}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
-	mv "${D}/usr/share/man/man3"/uuid.3{,ossp}
-	mv "${D}/usr/share/man/man3"/uuid++.3{,ossp}
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	# Tests for the php-bindings would be available
-}
--- a/net-proxy/squid/Manifest	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-AUX squid-3.1.10-gentoo.patch 10181 RMD160 ef5afec1b300984db7383648dd994dbeb80d88fc SHA1 b09b70f569df1f4171802d635f57d9b5f9718e5e SHA256 4ffacf14d12f316073ef3e36f0ff530eb83b5748898535699011a04e7f57e427
-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.10.tar.gz 3348337 RMD160 06b8569e821ba8d34f00d2cd488baf9be0b4f178 SHA1 2aec08938510e4161c07e8523eed04f8a51d8bc9 SHA256 f069b206e64d5f8b193436d6360aeb4874a70d6697fb0152126b158fccb4852e
-EBUILD squid-3.1.10.ebuild 6937 RMD160 26b15c81e07fd8759216d72d8c757377f76517aa SHA1 d27d84691c13a402207281cefc20d4489365e114 SHA256 c11bb0b6fba9ca7b3ddcc52c592f8e33619b45af61e5b9f5c0cf93b4408d3aae
--- a/net-proxy/squid/files/squid-3.1.10-gentoo.patch	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-diff -Nru squid-3.1.10.orig/acinclude.m4 squid-3.1.10/acinclude.m4
---- squid-3.1.10.orig/acinclude.m4	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/acinclude.m4	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.10/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.10.orig/helpers/basic_auth/MSNT/confload.c	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/helpers/basic_auth/MSNT/confload.c	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.10/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.10.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/helpers/basic_auth/MSNT/msntauth.conf.default	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.10/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.10.orig/helpers/basic_auth/SMB/Makefile.am	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/helpers/basic_auth/SMB/Makefile.am	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.10/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.10.orig/helpers/basic_auth/SMB/smb_auth.sh	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/helpers/basic_auth/SMB/smb_auth.sh	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/helpers/external_acl/session/squid_session.8 squid-3.1.10/helpers/external_acl/session/squid_session.8
---- squid-3.1.10.orig/helpers/external_acl/session/squid_session.8	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/helpers/external_acl/session/squid_session.8	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.10/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.1.10.orig/helpers/external_acl/unix_group/squid_unix_group.8	2010-09-04 05:25:58.000000000 +0200
-+++ squid-3.1.10/helpers/external_acl/unix_group/squid_unix_group.8	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/lib/libTrie/acinclude.m4 squid-3.1.10/lib/libTrie/acinclude.m4
---- squid-3.1.10.orig/lib/libTrie/acinclude.m4	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/lib/libTrie/acinclude.m4	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/src/cf.data.pre squid-3.1.10/src/cf.data.pre
---- squid-3.1.10.orig/src/cf.data.pre	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/src/cf.data.pre	2010-09-23 23:34:10.000000000 +0200
-@@ -716,6 +716,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
-@@ -864,6 +865,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
-@@ -4036,11 +4040,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
-@@ -6357,7 +6361,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.10.orig/src/debug.cc squid-3.1.10/src/debug.cc
---- squid-3.1.10.orig/src/debug.cc	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/src/debug.cc	2010-09-23 23:34:10.000000000 +0200
-@@ -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.10.orig/src/main.cc squid-3.1.10/src/main.cc
---- squid-3.1.10.orig/src/main.cc	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/src/main.cc	2010-09-23 23:34:10.000000000 +0200
-@@ -1556,7 +1556,7 @@
-     if (*(argv[0]) == '(')
-         return;
- 
--    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-     if ((pid = fork()) < 0)
-         syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1600,7 +1600,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_DAEMON);
-             prog = xstrdup(argv[0]);
-             argv[0] = xstrdup("(squid)");
-             execvp(prog, argv);
-@@ -1608,7 +1608,7 @@
-         }
- 
-         /* parent */
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-         syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
- 
-diff -Nru squid-3.1.10.orig/src/Makefile.am squid-3.1.10/src/Makefile.am
---- squid-3.1.10.orig/src/Makefile.am	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.10/src/Makefile.am	2010-09-23 23:34:10.000000000 +0200
-@@ -638,7 +638,6 @@
- 
- sysconf_DATA = \
- 	squid.conf.default \
--	squid.conf.documented \
- 	mime.conf.default
- 
- data_DATA = \
-@@ -719,8 +718,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); \
- 	$(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
- 
--- a/net-proxy/squid/files/squid.confd	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# 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=""
--- a/net-proxy/squid/files/squid.cron	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#!/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
--- a/net-proxy/squid/files/squid.initd	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-#!/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 $?
-}
--- a/net-proxy/squid/files/squid.initd-logrotate	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-#!/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 $?
-}
--- a/net-proxy/squid/files/squid.logrotate	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/var/log/squid/*.log {
-    copytruncate
-    compress
-    notifempty
-    missingok
-    sharedscripts
-}
-
--- a/net-proxy/squid/files/squid.pam	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#%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
--- a/net-proxy/squid/squid-3.1.10.ebuild	Wed Aug 31 18:30:17 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.8.ebuild,v 1.9 2010/10/09 16:31:59 armin76 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 tproxy"
-RESTRICT=test
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	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
-	sys-apps/ed
-	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 )"
-
-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
-
-	if use tproxy && ! use caps; then
-		eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!"
-		eerror "Please enable caps USE flag and try again."
-
-		die "invalid combination of USE flags"
-	fi
-
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.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 tproxy linux-tproxy)
-			$(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
-}