# HG changeset patch # User Dirk Olmes # Date 1333373945 -7200 # Node ID cee7e5f9f250cd24610568373e5dfff53d88deb5 # Parent 19a25aae5976912762628551be4df783cb49d01f# Parent 90e704dfb755bf93c777b5fa448a4c59c99e3f5e Automated merge with http://hoho.dyndns.org/hg/portage diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-base/Manifest --- a/dev-db/postgresql-base/Manifest Sat Nov 05 03:28:44 2011 +0100 +++ /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 diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-base/files/postgresql-9.0-base.3.patch --- a/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch Sat Nov 05 03:28:44 2011 +0100 +++ /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 - diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-base/files/postgresql-9.0-common.3.patch --- a/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch Sat Nov 05 03:28:44 2011 +0100 +++ /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) diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-base/metadata.xml --- a/dev-db/postgresql-base/metadata.xml Sat Nov 05 03:28:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - -postgresql - - Enable --enable-integer-datetimes configure - option, which changes PG to use 64-bit integers for timestamp storage - Use double precision floating-point numbers - instead of 64-bit integers for timestamp storage. - - - - diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-base/postgresql-base-9.0.2.ebuild --- a/dev-db/postgresql-base/postgresql-base-9.0.2.ebuild Sat Nov 05 03:28:44 2011 +0100 +++ /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 -} diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-server/Manifest --- a/dev-db/postgresql-server/Manifest Sat Nov 05 03:28:44 2011 +0100 +++ /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 diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-server/files/postgresql-9.0-common.3.patch --- a/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch Sat Nov 05 03:28:44 2011 +0100 +++ /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) diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-server/files/postgresql-9.0-server.3.patch --- a/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch Sat Nov 05 03:28:44 2011 +0100 +++ /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 diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-server/files/postgresql.conf-9.0-r1 --- a/dev-db/postgresql-server/files/postgresql.conf-9.0-r1 Sat Nov 05 03:28:44 2011 +0100 +++ /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\"" diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-server/files/postgresql.init-9.0-r1 --- a/dev-db/postgresql-server/files/postgresql.init-9.0-r1 Sat Nov 05 03:28:44 2011 +0100 +++ /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 $? -} diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-server/metadata.xml --- a/dev-db/postgresql-server/metadata.xml Sat Nov 05 03:28:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - -postgresql - - Enable server side UUID generation - (via dev-libs/ossp-uuid) - Use double precision floating-point numbers - instead of 64-bit integers for timestamp storage. - - - diff -r 90e704dfb755 -r cee7e5f9f250 dev-db/postgresql-server/postgresql-server-9.0.2.ebuild --- a/dev-db/postgresql-server/postgresql-server-9.0.2.ebuild Sat Nov 05 03:28:44 2011 +0100 +++ /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." -} diff -r 90e704dfb755 -r cee7e5f9f250 dev-java/maven-bin/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/maven-bin/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,2 @@ +DIST apache-maven-3.0.4-bin.tar.gz 4873043 RMD160 c55335fb5c10380db64e6b56ee26cd6f42307a72 SHA1 0de5dc162bafde3fcb0a6b009cfeea81a042523b SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f +EBUILD maven-bin-3.0.4.ebuild 1254 RMD160 ad6feea9826ec58c2deca437899caab482cdd580 SHA1 1a3d4f2ecffaf69a830770258397d9cbb37bbfa6 SHA256 c70e594f7bc803fcbfd4256cfe1cfe189e568c42752305e22ff3af0f79d67792 diff -r 90e704dfb755 -r cee7e5f9f250 dev-java/maven-bin/maven-bin-3.0.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/maven-bin/maven-bin-3.0.4.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,49 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.2.ebuild,v 1.1 2011/01/15 12:25:40 fordfrog Exp $ + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_P="${MY_PN}-${PV}" + +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 + chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || 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} + + # bug #342901 + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +} diff -r 90e704dfb755 -r cee7e5f9f250 dev-java/oracle-jdk-bin/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/oracle-jdk-bin/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,7 @@ +AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c +AUX oracle-jdk-bin-1.7.env 1075 RMD160 41d907b09f7607d7bb41090aeba3709288392951 SHA1 7d32eec42464d0a869a63432b6c7d5cb6bb09064 SHA256 216a629d271095f87501a0872288b5da994796717097e3d9e6a6ecc2c00621eb +DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d +DIST jdk-7u4-ea-bin-b18-linux-i586-29_mar_2012.tar.gz 82919711 RMD160 a5d32738cb790e7a9324e2a5389b64cadccb4ad4 SHA1 1166c947df0ed1371aae58290d6ecc678833d02c SHA256 9e3c4d2df4dcebbf12659adfb2d182ce67a33433f25ed65a02f47106371b84e4 +DIST jdk-7u4-ea-bin-b18-linux-x64-29_mar_2012.tar.gz 81429848 RMD160 24ee3b50c63eeaf697af4fe6104091ceb923d6b7 SHA1 9f0307128e7f157abb16d8b9a595c7e72295f497 SHA256 32f3cc3d6e090b16a6c1a77c8914b267f2442ede283608f5845d5437f9e65278 +EBUILD oracle-jdk-bin-1.7.0.4.ebuild 4918 RMD160 979182bfb3f5cfacf910fa3a28da666784da474a SHA1 5f8c6c98fecb6fadad08065c16f1c799e6e328a5 SHA256 d2eb73c0fe22d74805842988b180f7e0ef13caee80ceb436c08eaa90ec9069dc +MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232 diff -r 90e704dfb755 -r cee7e5f9f250 dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/oracle-jdk-bin/files/fontconfig.Gentoo.properties Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,161 @@ +# Version + +version=1 + +# Component Font Mappings + +allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1 +allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0 +allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0 +allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 + +serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 +serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1 + +serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 +serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1 + +serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 +serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1 + +serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 +serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 + +sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 + +monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 + +monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 + +monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 + +monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 + +dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1 + +dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1 + +dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1 + +dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1 + +dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1 + +dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1 + +dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1 + +dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 +dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1 +dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 +dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 +dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1 + +# Search Sequences + +sequence.allfonts=latin-1 +sequence.allfonts.Big5=latin-1,chinese-big5 +sequence.allfonts.GB2312=latin-1,chinese-gb18030 +sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208 +sequence.allfonts.EUC-KR=latin-1,korean +sequence.allfonts.GB18030=latin-1,chinese-gb18030 +sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean + +# Exclusion Ranges + +exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be + +# Font File Names + +filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf +filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf +filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf +filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf +filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf +filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf + +# AWT X11 font paths +awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1 +awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts +awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts +awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute +awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts diff -r 90e704dfb755 -r cee7e5f9f250 dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,17 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env,v 1.1 2011/09/08 07:28:32 caster Exp $ + +VERSION="Oracle JDK @PV@" +JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" +JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" +JAVAC=${JAVA_HOME}/bin/javac +PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/java/packages/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib64:@GENTOO_PORTAGE_EPREFIX@/lib64:@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib" +MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="1.7" +BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/classes" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff -r 90e704dfb755 -r cee7e5f9f250 dev-java/oracle-jdk-bin/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/oracle-jdk-bin/metadata.xml Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,10 @@ + + + + java + Oracle Java SE Development Kit, Official Binary Distribution + + Enable Installation of Bundled Derby (Java DB) + Enable Java Cryptographic Extension Unlimited Strength Policy files + + diff -r 90e704dfb755 -r cee7e5f9f250 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.4.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,167 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.ebuild,v 1.1 2011/09/08 07:28:32 caster Exp $ + +EAPI="4" + +inherit java-vm-2 eutils pax-utils prefix versionator + +UPDATE="$(get_version_component_range 4)" +UPDATE="${UPDATE#0}" +#MY_PV="$(get_version_component_range 2)u${UPDATE}" +MY_PV="7u4-ea-bin-b18" +MY_PV_DATE="29_mar_2012" +S_PV="$(get_version_component_range 1-3)_0${UPDATE}" + +X86_AT="jdk-${MY_PV}-linux-i586-${MY_PV_DATE}.tar.gz" +AMD64_AT="jdk-${MY_PV}-linux-x64-${MY_PV_DATE}.tar.gz" + +# check the URIs when bumping, no idea about their stability yet +JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html" +JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" + +JCE_DIR="UnlimitedJCEPolicy" +JCE_FILE="${JCE_DIR}JDK7.zip" + +DESCRIPTION="Oracle's Java SE Development Kit" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI="x86? ( ${X86_AT} ) + amd64? ( ${AMD64_AT} ) + jce? ( ${JCE_FILE} )" +SLOT="1.7" +LICENSE="Oracle-BCLA-JavaSE" +KEYWORDS="~amd64 ~x86" +RESTRICT="fetch strip" +IUSE="X alsa derby doc examples jce nsplugin" + +QA_TEXTRELS_x86=" + opt/${P}/jre/lib/i386/client/libjvm.so + opt/${P}/jre/lib/i386/server/libjvm.so" + +DEPEND="jce? ( app-arch/unzip )" +RDEPEND="${DEPEND} + doc? ( dev-java/java-sdk-docs:1.7 ) + !prefix? ( sys-libs/glibc ) + alsa? ( media-libs/alsa-lib ) + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libX11 + )" + +S="${WORKDIR}/jdk${S_PV}" + +pkg_nofetch() { + if use x86; then + AT=${X86_AT} + elif use amd64; then + AT=${AMD64_AT} + fi + + einfo "Please download ${AT} from:" + einfo "${JDK_URI}" + einfo "and move it to ${DISTDIR}" + + if use jce; then + einfo "Also download ${JCE_FILE} from:" + einfo ${JCE_URI} + einfo "and move it to ${DISTDIR}" + fi +} + +src_prepare() { + if use jce; then + mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die + fi +} + +src_compile() { + # Set PaX markings on all JDK/JRE executables to allow code-generation on + # the heap by the JIT compiler. This needs to be done before CDS - #215225 + pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + "${S}"/bin/java -client -Xshare:dump || die + fi + "${S}"/bin/java -server -Xshare:dump || die + + # Create files used as storage for system preferences. + mkdir jre/.systemPrefs || die + touch jre/.systemPrefs/.system.lock || die + touch jre/.systemPrefs/.systemRootModFile || die +} + +src_install() { + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ + {,jre/}lib/i386/libjavaplugin_nscp*.so + rm -vrf jre/plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf {,jre/}lib/${arch}/libnpjp2.so \ + {,jre/}lib/${arch}/libjavaplugin_jni.so + fi + + dodir /opt/${P} + cp -pPR bin include jre lib man src.zip "${ED}"/opt/${P} || die + + if use derby; then + cp -pPR db "${ED}"/opt/${P} || die + fi + + if use examples; then + cp -pPR demo sample "${ED}"/opt/${P} || die + fi + + # Remove empty dirs we might have copied + rmdir -v $(find "${D}" -type d -empty) || die + + dodoc COPYRIGHT + dohtml README.html + + if use jce; then + dodir /opt/${P}/jre/lib/security/strong-jce + mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \ + "${ED}"/opt/${P}/jre/lib/security/strong-jce || die + mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \ + "${ED}"/opt/${P}/jre/lib/security/strong-jce || die + dosym /opt/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ + /opt/${P}/jre/lib/security/ + dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \ + /opt/${P}/jre/lib/security/ + fi + + if use nsplugin; then + install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. Using VMHANDLE as file + # name to prevent file collision with jre and or other slots. + [[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die + sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT}/" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \ + "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \ + "${T}"/${VMHANDLE}.desktop + + domenu "${T}"/${VMHANDLE}.desktop + + # bug #56444 + cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto /opt/${P}/jre/lib/ + doins "${T}"/fontconfig.properties + + set_java_env + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} diff -r 90e704dfb755 -r cee7e5f9f250 dev-lang/erlang/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,7 @@ +AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4 +AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494 +DIST otp_doc_html_R15B.tar.gz 28996680 RMD160 79606286c3708a56dbc9e54efb60f184fe36c809 SHA1 a163b940fa6e4c60f4c9cfe47d993977660e7ed1 SHA256 40504ad983b450a2c6f7611b3be88ebd6349079764520cca050e9c8f6e79dc93 +DIST otp_doc_man_R15B.tar.gz 1122044 RMD160 ba9352d78462a3ec3461ea955ae46b96cad95400 SHA1 4fb7b64ce06a5209a420914962784ca4a38d2113 SHA256 1839cc4cab3120401989e0e1d7ad6872a59e2fd9d3cd82f05ca8c4ebef18eb6b +DIST otp_src_R15B.tar.gz 74100507 RMD160 022ed91978e85f5a446a90825aa686dd608061a9 SHA1 8177a5d40e4a3d7eb8dc7f7898241a034f35ea72 SHA256 5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2 +EBUILD erlang-15.2.ebuild 5422 RMD160 eea88e6100b5ce8a50b712a3c85ef262fc59db0e SHA1 2abf97a887f383f0e57c2f73f78a53f632a75e8c SHA256 267a87783467f922b87acf5d55ff7f3fc50b77422d929f700fb85f8b725f3042 +MISC metadata.xml 744 RMD160 47d7adeeeb67a91bb6d124522946f4075021a2f3 SHA1 1bc2d0cd3e1c8f4f10290087ab7e1ace28d3002b SHA256 81b659111fcfcd664dc7c096a52fd295b6010663eb4de875d863ed6e40dbae82 diff -r 90e704dfb755 -r cee7e5f9f250 dev-lang/erlang/erlang-15.2.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/erlang-15.2.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,180 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.4.ebuild,v 1.2 2011/12/07 17:44:39 ulm Exp $ + +EAPI=3 +WX_GTK_VER="2.8" + +inherit elisp-common eutils java-pkg-opt-2 multilib versionator wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +# erlang uses a really weird versioning scheme which caused quite a few problems +# already. Thus we do a slight modification converting all letters to digits to +# make it more sane (see e.g. #26420) + +# the next line selects the right source. +ERL_VER=($(get_version_components)) +MY_PV="R$(get_major_version)B${ERL_VER[2]}" + +# ATTN!! Take care when processing the C, etc version! +MY_P=otp_src_${MY_PV} + +DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" +HOMEPAGE="http://www.erlang.org/" +SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz + http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )" + +LICENSE="ErlPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets" + +RDEPEND=">=dev-lang/perl-5.6.1 + ssl? ( >=dev-libs/openssl-0.9.7d ) + emacs? ( virtual/emacs ) + java? ( >=virtual/jdk-1.2 ) + odbc? ( dev-db/unixODBC )" +DEPEND="${RDEPEND} + wxwidgets? ( x11-libs/wxGTK:2.8[opengl] ) + sctp? ( net-misc/lksctp-tools ) + tk? ( dev-lang/tk )" + +S="${WORKDIR}/${MY_P}" + +SITEFILE=50${PN}-gentoo.el + +pkg_setup() { + use wxwidgets && wxwidgets_pkg_setup + if use halfword ; then + use amd64 || die "halfword support is limited to amd64" + fi +} + +src_prepare() { + use odbc || sed -i 's: odbc : :' lib/Makefile + + # bug 263129, don't ignore LDFLAGS, reported upstream + sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in || die + + if ! use wxwidgets; then + sed -i 's: wx : :' lib/Makefile + rm -rf lib/wx + fi + + # Nasty workaround, reported upstream + cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in || die + + # prevent configure from injecting -m32 by default on Darwin, bug #334155 + # Nasty hack + sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die + sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die + + # bug 383697 + sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die +} + +src_configure() { + use java || export JAVAC=false + + econf \ + --enable-threads \ + --enable-shared-zlib \ \ + $(use_enable sctp) \ + $(use_enable halfword halfword-emulator) \ + $(use_enable hipe) \ + $(use_with ssl ssl "${EPREFIX}"/usr) \ + $(use_enable ssl dynamic-ssl-lib) \ + $(use_enable kpoll kernel-poll) \ + $(use_enable smp smp-support) \ + || die +} + +src_compile() { + use java || export JAVAC=false + emake -j1 || die + + if use emacs ; then + pushd lib/tools/emacs + elisp-compile *.el || die + popd + fi +} + +extract_version() { + sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk" +} + +src_install() { + local ERL_LIBDIR=/usr/$(get_libdir)/erlang + local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN) + local ERL_ERTS_VER=$(extract_version erts VSN) + + emake -j1 INSTALL_PREFIX="${D}" install || die + dodoc AUTHORS README.md + + dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl + dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc + dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript + dosym \ + "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \ + /usr/bin/erl_call + dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam + use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp + + ## Remove ${D} from the following files + sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" || die + sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" || die + grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g" + + ## Clean up the no longer needed files + rm "${ED}/${ERL_LIBDIR}/Install"||die + + for i in "${WORKDIR}"/man/man* ; do + dodir "${ERL_LIBDIR}/${i##${WORKDIR}}" + done + for file in "${WORKDIR}"/man/man*/*.[1-9]; do + # doman sucks so we can't use it + cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/ + done + # extend MANPATH, so the normal man command can find it + # see bug 189639 + dodir /etc/env.d/ + echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang" + + if use doc ; then + dohtml -A README,erl,hrl,c,h,kwc,info -r \ + "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* + fi + + if use emacs ; then + pushd "${S}" + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE} + elisp-site-file-install "${T}"/${SITEFILE} + popd + fi + + # prepare erl for SMP, fixes bug #188112 + use smp && sed -i -e 's:\(exec.*erlexec\):\1 -smp:' \ + "${ED}/${ERL_LIBDIR}/bin/erl" + + newinitd "${FILESDIR}"/epmd.init epmd || die +} + +pkg_postinst() { + use emacs && elisp-site-regen + elog + elog "If you need a symlink to one of Erlang's binaries," + elog "please open a bug on http://bugs.gentoo.org/" + elog + elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as ${MY_PV}" + elog +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff -r 90e704dfb755 -r cee7e5f9f250 dev-lang/erlang/files/50erlang-gentoo.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/files/50erlang-gentoo.el Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,5 @@ +;;; erlang site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(require 'erlang-start) +(setq erlang-root-dir "/usr/share") diff -r 90e704dfb755 -r cee7e5f9f250 dev-lang/erlang/files/epmd.init --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/files/epmd.init Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/files/epmd.init,v 1.1 2010/11/08 00:47:30 fauli Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting Erlang Port Mapper Daemon" + start-stop-daemon --start --quiet --user nobody --group nobody --exec /usr/bin/epmd -- -daemon + eend $? +} + +stop() { + ebegin "Stopping Erlang Port Mapper Daemon" + /usr/bin/epmd -kill >/dev/null + eend $? +} diff -r 90e704dfb755 -r cee7e5f9f250 dev-lang/erlang/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-lang/erlang/metadata.xml Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,21 @@ + + + +lang-misc + +djc@gentoo.org +Dirkjan Ochtman + + + HIgh Performance Erlang extension + Enable halfword emulator + Enable kernel polling support + Support for Stream Control Transmission Protocol + + +Erlang is a programming language designed at the Ericsson +Computer Science Laboratory. Open-source Erlang is being +released to help encourage the spread of Erlang outside +Ericsson. + + diff -r 90e704dfb755 -r cee7e5f9f250 dev-libs/ossp-uuid/Manifest --- a/dev-libs/ossp-uuid/Manifest Sat Nov 05 03:28:44 2011 +0100 +++ /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 diff -r 90e704dfb755 -r cee7e5f9f250 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch Sat Nov 05 03:28:44 2011 +0100 +++ /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@ - diff -r 90e704dfb755 -r cee7e5f9f250 dev-libs/ossp-uuid/ossp-uuid-1.6.2.ebuild --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2.ebuild Sat Nov 05 03:28:44 2011 +0100 +++ /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 -} diff -r 90e704dfb755 -r cee7e5f9f250 net-libs/rb_libtorrent/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-libs/rb_libtorrent/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,3 @@ +DIST libtorrent-rasterbar-0.15.9.tar.gz 2619950 RMD160 54461ff314af9602309a9a34a97cb481dc38179c SHA1 d86eb9d4452d07715a355d3a67312f162d6eff3a SHA256 a2ea68011e9933c7deb473268122f016171d24f0f35e744fbdadd14bf6bac23d +EBUILD rb_libtorrent-0.15.9.ebuild 2188 RMD160 f7909bc20c88555cc51a6583f54f6c6e0579ffa4 SHA1 c3bd790653f6e1445b890353317bc8331293aa16 SHA256 3fc0bc1d72e4511e963439d6e13fcb4077d35c75c2b97b81921e966efb139d4d +MISC metadata.xml 279 RMD160 fee9ba43ed5741d59ca721d799c0580f00cc71ef SHA1 093f218c86045f1c60aebde8a54cb673dee8f7f7 SHA256 36618b123d1f4f5b758e481463ea56c0d2a61230f223ccb4a8f1cc2ed4d01584 diff -r 90e704dfb755 -r cee7e5f9f250 net-libs/rb_libtorrent/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-libs/rb_libtorrent/metadata.xml Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,10 @@ + + + + net-p2p + qt + + hwoarang@gentoo.org + Markos Chandras + + diff -r 90e704dfb755 -r cee7e5f9f250 net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,75 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild,v 1.5 2011/05/26 21:21:00 maekke Exp $ + +EAPI="2" +PYTHON_DEPEND="python? 2:2.6" +PYTHON_USE_WITH="threads" + +inherit eutils versionator python + +MY_P=${P/rb_/} +MY_P=${MY_P/torrent/torrent-rasterbar} +S=${WORKDIR}/${MY_P} + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" +SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +IUSE="debug doc examples python ssl" +RESTRICT="test" + +DEPEND=">=dev-libs/boost-1.36[python?] + >=sys-devel/libtool-2.2 + sys-libs/zlib + examples? ( !net-p2p/mldonkey ) + ssl? ( dev-libs/openssl )" + +RDEPEND="${DEPEND}" + +pkg_setup() { + use python && python_set_active_version 2 +} + +src_prepare() { + use python && python_convert_shebangs -r 2 . +} + +src_configure() { + # use multi-threading versions of boost libs + local BOOST_LIBS="--with-boost-system=boost_system-mt \ + --with-boost-filesystem=boost_filesystem-mt \ + --with-boost-thread=boost_thread-mt \ + --with-boost-python=boost_python-mt" + # detect boost version and location, bug 295474 + BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")" + BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" + BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")" + BOOST_INC="/usr/include/boost-${BOOST_VER}" + BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}" + + local LOGGING + use debug && LOGGING="--enable-logging=verbose" + + econf $(use_enable debug) \ + $(use_enable test tests) \ + $(use_enable examples) \ + $(use_enable python python-binding) \ + $(use_enable ssl encryption) \ + --with-zlib=system \ + ${LOGGING} \ + --with-boost=${BOOST_INC} \ + --with-boost-libdir=${BOOST_LIB} \ + ${BOOST_LIBS} +} + +src_install() { + emake DESTDIR="${D}" install || die 'emake install failed' + dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed' + if use doc ; then + dohtml docs/* || die "Could not install HTML documentation" + fi +} diff -r 90e704dfb755 -r cee7e5f9f250 net-misc/rabbitmq-server/Manifest --- a/net-misc/rabbitmq-server/Manifest Sat Nov 05 03:28:44 2011 +0100 +++ b/net-misc/rabbitmq-server/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -1,5 +1,5 @@ AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e -AUX rabbitmq-server.init-r1 640 RMD160 74285fbafeeec24b3c9f5e83ec0f65bed9e23a06 SHA1 c68b9493920a25dbad9ad27e462defbff775c582 SHA256 5c4110c077679461105d77f1b1048bf014f6f4a817e402a1f6bc0d93feaa1ae4 -DIST rabbitmq-server-2.4.0.tar.gz 318182 RMD160 6362f4f2bf06f201410132be91edbd64a1577798 SHA1 9f39d830aa778cf8e71fd5eb47c8a42e26c3c42d SHA256 aadad1bb6ae8b7ecba73dbe1c74a2dfd3ac0559018ed0d433af1df9938f67e7f -EBUILD rabbitmq-server-2.4.0.ebuild 2237 RMD160 6afbe2bdea6a454580b6a13b55c73e0b7cea2296 SHA1 a490ffcacdfac87fdd1e50f9c83bf749bad29bc5 SHA256 5b9f6b8b7fe38e8a21578b72922c3d79de01d7d8270fab220ffc212d699a66dd +AUX rabbitmq-server.init-r3 744 RMD160 eb810f5428ad16a3e2c143a84b9666abf49a535b SHA1 b2e6586dd21e8debbb8ff5e7cb8e59f1abf16626 SHA256 76aa4fe4578c31fe076d7c48770b63ad8836996352a981c6bba415e67e071b5c +DIST rabbitmq-server-2.8.1.tar.gz 2644402 RMD160 519fe864a36d27cf38a97479e621b15d9a8a6e5b SHA1 24f13c7a9b5d8daf57cb6844e06b605d934f7088 SHA256 b59f46d2cc4ce3427ba16e00cb9def7c51ca9f6b92473c6ae8fc43f6e4d60835 +EBUILD rabbitmq-server-2.8.1.ebuild 2413 RMD160 7b4bc90b13bf0d192b1ef21e18bb7a0cd2f266e5 SHA1 45680361c1983d54bd8da197b2d0652ad489b84d SHA256 0c2686eb3850bc6458e4b0afafe3b8c9c8fe6db96ecfd5e28b38c4be781d5c80 MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0 diff -r 90e704dfb755 -r cee7e5f9f250 net-misc/rabbitmq-server/files/rabbitmq-server.init-r1 --- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1 Sat Nov 05 03:28:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +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/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1,v 1.1 2010/08/28 14:33:02 hollow Exp $ - -depend() { - need epmd - need net - use dns -} - -start() { - ebegin "Starting RabbitMQ..." - start-stop-daemon --start --background --exec /usr/sbin/rabbitmq-server >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err - eend $? -} - -stop() { - ebegin "Stopping RabbitMQ..." - /usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err - eend $? -} diff -r 90e704dfb755 -r cee7e5f9f250 net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,23 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3,v 1.1 2011/09/30 07:45:54 hollow Exp $ + +depend() { + need net + use dns epmd +} + +start() { + ebegin "Starting RabbitMQ" + /usr/sbin/rabbitmq-server -detached >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err + /usr/sbin/rabbitmqctl status | sed -n 's/[^p]*pid,\([0-9]*\)[^0-9]*/\1/p' > /var/run/rabbitmq.pid + /usr/sbin/rabbitmqctl -q wait /var/run/rabbitmq.pid + eend $? +} + +stop() { + ebegin "Stopping RabbitMQ" + /usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err + eend $? +} diff -r 90e704dfb755 -r cee7e5f9f250 net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild --- a/net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild Sat Nov 05 03:28:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.1.0.ebuild,v 1.1 2010/09/19 08:35:51 hollow Exp $ - -EAPI="2" - -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="" - -RDEPEND="dev-lang/erlang" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - dev-libs/libxslt - dev-python/simplejson -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq -} - -src_compile() { - emake all docs_all || die "emake all failed" - gunzip docs/*.gz -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/${P}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i scripts/rabbitmq-env - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r ebin include - - einfo "Installing server scripts to /usr/sbin" - for script in rabbitmq-env rabbitmq-server rabbitmqctl; do - exeinto /usr/libexec/rabbitmq - doexe scripts/${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script} - done - - # 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-r1 rabbitmq - - # install documentation - doman docs/*.[15] - dodoc README -} - -pkg_preinst() { - if has_version "<=net-misc/rabbitmq-server-1.8.0"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "RabbitMQ is now running as an unprivileged user instead of root." - elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." - elog "Please run the following commands as root:" - elog - elog " usermod -d /var/lib/rabbitmq rabbitmq" - elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" - elog - fi -} diff -r 90e704dfb755 -r cee7e5f9f250 net-misc/rabbitmq-server/rabbitmq-server-2.8.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/rabbitmq-server-2.8.1.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,88 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.7.9.ebuild,v 1.2 2012/03/19 09:17:57 hollow Exp $ + +EAPI="4" +PYTHON_DEPEND="2" + +inherit eutils python + +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="" + +RDEPEND="dev-lang/erlang" +DEPEND="${RDEPEND} + app-arch/zip + app-arch/unzip + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + dev-libs/libxslt + dev-python/simplejson +" + +pkg_setup() { + enewgroup rabbitmq + enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq + python_set_active_version 2 + python_pkg_setup +} + +src_compile() { + emake all docs_all || die "emake all failed" + gunzip docs/*.gz +} + +src_install() { + # erlang module + local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" + + einfo "Setting correct RABBITMQ_HOME in scripts" + sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ + -i scripts/rabbitmq-env + + einfo "Installing Erlang modules to ${targetdir}" + insinto "${targetdir}" + doins -r ebin include plugins + + einfo "Installing server scripts to /usr/sbin" + for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do + exeinto /usr/libexec/rabbitmq + doexe scripts/${script} + newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script} + done + + # create the directory where our log file will go. + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/log/rabbitmq /etc/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-r3 rabbitmq + + # install documentation + doman docs/*.[15] + dodoc README +} + +pkg_preinst() { + if has_version "<=net-misc/rabbitmq-server-1.8.0"; then + elog "IMPORTANT UPGRADE NOTICE:" + elog + elog "RabbitMQ is now running as an unprivileged user instead of root." + elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." + elog "Please run the following commands as root:" + elog + elog " usermod -d /var/lib/rabbitmq rabbitmq" + elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" + elog + fi +} diff -r 90e704dfb755 -r cee7e5f9f250 net-p2p/deluge/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-p2p/deluge/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,5 @@ +AUX deluged.conf 184 RMD160 f1721fcc20b77836c783cbe4e7492748902f0428 SHA1 e330df742ae8f21e7dfbbaa31f181279ef96e3b8 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d +AUX deluged.init 2057 RMD160 459e907d5521b5c32ebc2477235129c820678876 SHA1 0346b63ec3766e162d6132156fa0d1acaffd8b9a SHA256 559cbf3ce2121e4d00605191e8ecb854fb3ee2d181de5d4a79c9d3098a1cecbd +DIST deluge-1.3.4.tar.lzma 2084939 RMD160 5f67ca0d3e9613729d76d1a089b2fcf1e95d266d SHA1 90956326e85399486a34c7863c47f672b9f6ae67 SHA256 5caa55e2ce5848c01332569516e91426be0640115680f41687319c1055ae345f +EBUILD deluge-1.3.4.ebuild 1805 RMD160 ece0e8113f1fd20c81939462d2b1fa5dac7b8fa7 SHA1 bcc13a2c67f35d4f3069d39703d919e28c6cc4ff SHA256 55cc0c97447b27b35f49662076ce2a13330774017c2e0491fd33cd19a98f29c0 +MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f diff -r 90e704dfb755 -r cee7e5f9f250 net-p2p/deluge/deluge-1.3.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-p2p/deluge/deluge-1.3.4.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,69 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.3.ebuild,v 1.2 2011/08/17 13:52:12 armin76 Exp $ + +EAPI="3" +PYTHON_DEPEND="2:2.5" + +inherit distutils flag-o-matic + +DESCRIPTION="BitTorrent client with a client/server model." +HOMEPAGE="http://deluge-torrent.org/" +SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.lzma" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="gtk libnotify webinterface" + +DEPEND=">=net-libs/rb_libtorrent-0.14.9[python] + dev-python/setuptools + dev-util/intltool" +RDEPEND="${DEPEND} + dev-python/chardet + dev-python/pyopenssl + dev-python/pyxdg + || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) + >=dev-python/twisted-8.1 + >=dev-python/twisted-web-8.1 + gtk? ( + dev-python/pygame + dev-python/pygobject + >=dev-python/pygtk-2.12 + gnome-base/librsvg + libnotify? ( dev-python/notify-python ) + ) + webinterface? ( dev-python/mako )" + +pkg_setup() { + append-ldflags $(no-as-needed) + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + distutils_src_prepare + python_convert_shebangs -r 2 . +} + +src_install() { + distutils_src_install + newinitd "${FILESDIR}"/deluged.init deluged + newconfd "${FILESDIR}"/deluged.conf deluged +} + +pkg_postinst() { + distutils_pkg_postinst + elog + elog "If after upgrading it doesn't work, please remove the" + elog "'~/.config/deluge' directory and try again, but make a backup" + elog "first!" + elog + elog "To start the daemon either run 'deluged' as user" + elog "or modify /etc/conf.d/deluged and run" + elog "/etc/init.d/deluged start as root" + elog "You can still use deluge the old way" + elog + elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq" + elog +} diff -r 90e704dfb755 -r cee7e5f9f250 net-p2p/deluge/files/deluged.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-p2p/deluge/files/deluged.conf Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,7 @@ +# /etc/conf.d/deluged +# Change this to the user you want to run deluged as. +# You may specify a group too, after a colon +DELUGED_USER="" +DELUGEUI_START="false" +DELUGEUI_OPTS="-u web" + diff -r 90e704dfb755 -r cee7e5f9f250 net-p2p/deluge/files/deluged.init --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-p2p/deluge/files/deluged.init Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,71 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.6 2010/10/02 15:36:03 armin76 Exp $ + +depend() { + need net +} + +checkconfig() { + if [ "${DELUGED_USER}" = "" ] ; then + eerror "Please edit /etc/conf.d/deluged" + eerror "You have to specify a user to run deluged as, as we will not run it as root!" + eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)" + return 1 + fi + if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then + eerror "Please edit /etc/conf.d/deluged" + eerror "Your user has to exist!" + return 1 + fi + if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then + return 0 + else + if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then + eerror "Please edit /etc/conf.d/deluged" + eerror "Your group has to exist too!" + return 1 + fi + fi + return 0 +} + +start() { + checkconfig || return $? + if [ "${DELUGED_HOME}" = "" ] ; then + DELUGED_USER_HOME=$(getent passwd "${DELUGED_USER%:*}" | cut -d ':' -f 6) + else + DELUGED_USER_HOME=${DELUGED_HOME} + fi + ebegin "Starting Deluged" + start-stop-daemon --start --user "${DELUGED_USER}" \ + --name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \ + --exec /usr/bin/deluged -u "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}" + eend $? + + + if [ "${DELUGEUI_START}" = "true" ] ; then + ebegin "Starting Deluge" + start-stop-daemon --start --background --pidfile \ + /var/run/deluge.pid --make-pidfile \ + --exec /usr/bin/deluge -c "${DELUGED_USER}" \ + -e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS} + eend $? + fi +} + +stop() { + ebegin "Stopping Deluged" + start-stop-daemon --stop --user "${DELUGED_USER}" \ + --name deluged --pidfile /var/run/deluged.pid + eend $? + + + if [ "${DELUGEUI_START}" = "true" ] ; then + ebegin "Stopping Deluge" + start-stop-daemon --stop --user "${DELUGED_USER}" \ + --name deluge --pidfile /var/run/deluge.pid + eend $? + fi +} diff -r 90e704dfb755 -r cee7e5f9f250 net-p2p/deluge/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-p2p/deluge/metadata.xml Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,13 @@ + + + +net-p2p + +net-p2p@gentoo.org + + + Install dependencies needed for the web + interface + + + diff -r 90e704dfb755 -r cee7e5f9f250 net-proxy/squid/Manifest --- a/net-proxy/squid/Manifest Sat Nov 05 03:28:44 2011 +0100 +++ b/net-proxy/squid/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -1,9 +1,10 @@ -AUX squid-3.1.10-gentoo.patch 10181 RMD160 ef5afec1b300984db7383648dd994dbeb80d88fc SHA1 b09b70f569df1f4171802d635f57d9b5f9718e5e SHA256 4ffacf14d12f316073ef3e36f0ff530eb83b5748898535699011a04e7f57e427 +AUX squid-3.1.15-gentoo.patch 10538 RMD160 f4ac679e89bdd8d43a2cd00b1a63d555a25b9528 SHA1 63b2c8a1767019b35b75403dd9a7bf6b33c69edc SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 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 3331 RMD160 90579b249baaf727fad9f6ceaaf8b2a1e5f1e97f SHA1 0b6f4e10d758619101f0ea56b5146dc268b8b3e0 SHA256 7a81926479941054358bce650c8c9d3f070a7b40c886e5ed3a337668997bc0ab 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 +DIST squid-3.1.18.tar.gz 3401300 RMD160 27bc3f868aa9d08bad7d44d23bc9c156007bf161 SHA1 6ae3a7d75acea94e8af333a7086d6467416ff5ac SHA256 6a7122514d58c3077f2b43c928864be10753d8e2c8439133dacc9eba6c45e00d +EBUILD squid-3.1.18.ebuild 6629 RMD160 d759605f7c281d2649ee95c16ee38c26e274f7a1 SHA1 e09b67d54d7889b8d72dcaada878054ab79a3514 SHA256 2bc745da81ed998762d82deaae18addd6fb8011b44425860b89e721b1d2e6b21 +MISC metadata.xml 1015 RMD160 03ac3fffc7b01e366b173a4c3bf1dc6be1bb9202 SHA1 3c1681981e2a143ee50d0ee5bc901ac81e7c5cc4 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a diff -r 90e704dfb755 -r cee7e5f9f250 net-proxy/squid/files/squid-3.1.10-gentoo.patch --- a/net-proxy/squid/files/squid-3.1.10-gentoo.patch Sat Nov 05 03:28:44 2011 +0100 +++ /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)` - diff -r 90e704dfb755 -r cee7e5f9f250 net-proxy/squid/files/squid-3.1.15-gentoo.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.15-gentoo.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,289 @@ +diff --git a/configure.ac b/configure.ac +index 23922c0..f359a00 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,9 +16,9 @@ PRESET_CFLAGS="$CFLAGS" + 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 --git a/helpers/basic_auth/MSNT/confload.c b/helpers/basic_auth/MSNT/confload.c +index e04365e..7241b3f 100644 +--- a/helpers/basic_auth/MSNT/confload.c ++++ b/helpers/basic_auth/MSNT/confload.c +@@ -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 --git a/helpers/basic_auth/MSNT/msntauth.conf.default b/helpers/basic_auth/MSNT/msntauth.conf.default +index 323bc1c..c3d7d21 100644 +--- a/helpers/basic_auth/MSNT/msntauth.conf.default ++++ b/helpers/basic_auth/MSNT/msntauth.conf.default +@@ -8,6 +8,6 @@ server my_PDC my_BDC my_NTdomain + 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 --git a/helpers/basic_auth/SMB/smb_auth.sh b/helpers/basic_auth/SMB/smb_auth.sh +index 2a1abb3..b3ebb7a 100755 +--- a/helpers/basic_auth/SMB/smb_auth.sh ++++ b/helpers/basic_auth/SMB/smb_auth.sh +@@ -24,7 +24,7 @@ read NMBCAST + read AUTHSHARE + read AUTHFILE + read SMBUSER +-read SMBPASS ++read -r SMBPASS + + # Find domain controller + echo "Domain name: $DOMAINNAME" +@@ -47,7 +47,7 @@ else + addropt="" + fi + echo "Query address options: $addropt" +-dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` ++dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` + echo "Domain controller IP address: $dcip" + [ -n "$dcip" ] || exit 1 + +diff --git a/helpers/external_acl/session/squid_session.8 b/helpers/external_acl/session/squid_session.8 +index 7808f41..d86e320 100644 +--- a/helpers/external_acl/session/squid_session.8 ++++ b/helpers/external_acl/session/squid_session.8 +@@ -35,7 +35,7 @@ the first request. + .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 --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8 +index 72aa1a3..cde5f20 100644 +--- a/helpers/external_acl/unix_group/squid_unix_group.8 ++++ b/helpers/external_acl/unix_group/squid_unix_group.8 +@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated) + 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 --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac +index e78f61e..ca6c0c2 100644 +--- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac ++++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac +@@ -17,6 +17,7 @@ dnl Process this file with autoconf to produce a configure script. + + 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 +diff --git a/src/Makefile.am b/src/Makefile.am +index e1c0be4..423553e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -639,7 +639,6 @@ BUILT_SOURCES = \ + + sysconf_DATA = \ + squid.conf.default \ +- squid.conf.documented \ + mime.conf.default + + data_DATA = \ +@@ -724,9 +724,9 @@ + 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_SSL_DB_DIR = $(localstatedir)/lib/ssl_db ++DEFAULT_NETDB_FILE = $(localstatedir)/run//netdb.state ++DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid ++DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db + 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)/'` +@@ -802,13 +801,11 @@ install-data-local: install-sysconfDATA install-dataDATA + @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)$(DEFAULT_SWAP_DIR); \ + $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)` +diff --git a/src/cf.data.pre b/src/cf.data.pre +index b504918..56928c4 100644 +--- a/src/cf.data.pre ++++ b/src/cf.data.pre +@@ -768,6 +768,7 @@ acl Safe_ports port 280 # http-mgmt + 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 +@@ -917,6 +918,9 @@ http_access deny CONNECT !SSL_ports + 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 +@@ -4138,11 +4142,11 @@ COMMENT_END + + 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 +@@ -6456,7 +6460,7 @@ DOC_END + 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 --git a/src/debug.cc b/src/debug.cc +index 32813bf..6de334a 100644 +--- a/src/debug.cc ++++ b/src/debug.cc +@@ -452,7 +452,7 @@ _db_init(const char *logfile, const char *options) + #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 --git a/src/main.cc b/src/main.cc +index 941126d..71f3c3b 100644 +--- a/src/main.cc ++++ b/src/main.cc +@@ -1555,7 +1555,7 @@ watch_child(char *argv[]) + 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()); +@@ -1599,7 +1599,7 @@ watch_child(char *argv[]) + + 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); +@@ -1607,7 +1607,7 @@ watch_child(char *argv[]) + } + + /* 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); + +commit e3f6cc6438869766751556f2d9747669b4c51fe1 +Author: Eray Aslan +Date: Fri Apr 29 10:55:17 2011 +0000 + + Do not auto detect kerberos. + + No need for automagic dependencies. We already give the necessary flags + to the configure script. + +diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac +index e78f61e..dc739b2 100644 +--- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac ++++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac +@@ -279,40 +279,6 @@ AC_ARG_ENABLE(seam-64, + check_seam_64 + fi ]) + +-dnl Define system default +-if test "$enable_arg" = "no"; then +- dnl Autodetect system +- dnl Check krb5-config first +- AC_CHECK_PROG(ac_krb5_config,krb5-config,yes,no) +- case $sys in +- Linux) rpm -q heimdal-lib >/dev/null 2>&1 +- if test $? = 0 ; then +- check_heimdal +- else +- check_mit +- fi +- ;; +- AIX) lslpp -L krb5.client.rte >/dev/null 2>&1 +- if test $? = 0 ; then +- check_nas +- else +- check_mit +- fi +- ;; +- SunOS) pkginfo SUNWgss >/dev/null 2>&1 +- if test $? = 0 ; then +- check_seam +- else +- check_mit +- fi +- ;; +- FreeBSD) check_heimdal +- ;; +- *) check_mit +- ;; +- esac +-fi +- + AC_C_BIGENDIAN + + AC_CHECK_HEADERS( \ diff -r 90e704dfb755 -r cee7e5f9f250 net-proxy/squid/files/squid.initd --- a/net-proxy/squid/files/squid.initd Sat Nov 05 03:28:44 2011 +0100 +++ b/net-proxy/squid/files/squid.initd Mon Apr 02 15:39:05 2012 +0200 @@ -1,9 +1,9 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2011 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $ -opts="${opts} reload rotate" +extra_started_commands="reload rotate" depend() { use dns diff -r 90e704dfb755 -r cee7e5f9f250 net-proxy/squid/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/metadata.xml Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,23 @@ + + + +net-proxy +A full-featured web proxy cache + + Enables Linux epoll() support + Adds support for loadable content adaptation modules + (http://www.e-cap.org) + Adds ICAP client support + Adds transparent proxy support for systems + using IP-Filter (only for *bsd) + Use app-admin/logrotate for rotating + logs + Enables *BSD kqueue() support + Adds transparent proxy support for systems using + PF (only for *bsd) + Enables real Transparent Proxy support for Linux Netfilter + TPROXY + Add Zero Penalty Hit patch + (http://zph.bratcheda.org) + + diff -r 90e704dfb755 -r cee7e5f9f250 net-proxy/squid/squid-3.1.10.ebuild --- a/net-proxy/squid/squid-3.1.10.ebuild Sat Nov 05 03:28:44 2011 +0100 +++ /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 -} diff -r 90e704dfb755 -r cee7e5f9f250 net-proxy/squid/squid-3.1.18.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/squid-3.1.18.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,209 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.16.ebuild,v 1.7 2011/12/18 20:54:49 halcy0n Exp $ + +EAPI=4 + +inherit eutils pam toolchain-funcs autotools linux-info + +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" + +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-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 )" + +REQUIRED_USE="tproxy? ( caps )" + +pkg_pretend() { + 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 uses a disabled store type" + fi + + if use tproxy; then + echo + elog "Checking kernel configuration for full Tproxy4 support" + local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" + linux-info_pkg_setup + echo + fi +} + +pkg_setup() { + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.1.15-gentoo.patch + eautoreconf +} + +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" + if has_version app-crypt/mit-krb5; then + myconf="--enable-mit --disable-heimdal" + elif has_version app-crypt/heimdal; then + myconf="--disable-mit --enable-heimdal" + fi + else + myconf="--disable-mit --disable-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_with caps libcap) \ + $(use_enable ipv6) \ + $(use_enable snmp) \ + $(use_enable ssl) \ + $(use_enable icap-client) \ + $(use_enable ecap) \ + $(use_enable zero-penalty-hit zph-qos) \ + ${myconf} +} + +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 + fperms 4750 /usr/libexec/squid/ncsa_auth + if use pam; then + fowners root:squid /usr/libexec/squid/pam_auth + fperms 4750 /usr/libexec/squid/pam_auth + fi + + # 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 + elog "Squid authentication helpers have been installed suid root." + elog "This allows shadow based authentication (see bug #52977 for more)." + echo + elog "Be careful what type of cache_dir you select!" + elog " 'diskd' is optimized for high levels of traffic, but it might seem slow" + elog "when there isn't sufficient traffic to keep squid reasonably busy." + elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'." +} diff -r 90e704dfb755 -r cee7e5f9f250 sys-cluster/zookeeper/Manifest --- a/sys-cluster/zookeeper/Manifest Sat Nov 05 03:28:44 2011 +0100 +++ b/sys-cluster/zookeeper/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -1,2 +1,2 @@ -DIST zookeeper-3.3.1.tar.gz 10279804 RMD160 a911202f6271901cc6fb4b64306808f64bff6e99 SHA1 683f439c149fdeaad996eb88d84caa2f2fc756c5 SHA256 dc77ef79aea6b19d418110e9a1e916cb4c26ceb7b3acb6792af32eb2a97ea536 -EBUILD zookeeper-3.3.1.ebuild 1522 RMD160 05f6dc9a9aa92f3444bd3233061a9c22749acb79 SHA1 add0d228a8885af2aea4273314147c65ffe716da SHA256 521bd45843722d5ed0be7da8371616edc276b509ec8c5a26dc46dd640ef53033 +DIST zookeeper-3.3.3.tar.gz 9639959 RMD160 c245ecbdf921f70ab4b4f5c9593452f9b3bea5c3 SHA1 66b62b71947df7b5f12a77a8435c332e6959dac8 SHA256 70808f5492ca1f9bec1ed7b129f2f7cb97df821ae04a6af9e99f23cdabe4f1d4 +EBUILD zookeeper-3.3.3.ebuild 1518 RMD160 e681302c1587e684fcc404614154e99fe613cd68 SHA1 0e69f31b0e3548bf5862cd3e1aa6dd789da12009 SHA256 33847dd8a848f2dbcdd70b235337fac8677a32aba009fff167963cf01019109a diff -r 90e704dfb755 -r cee7e5f9f250 sys-cluster/zookeeper/zookeeper-3.3.1.ebuild --- a/sys-cluster/zookeeper/zookeeper-3.3.1.ebuild Sat Nov 05 03:28:44 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils java-utils-2 - -MY_PN="${PN/apache-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="ZooKeeper is a high-performance coordination service for -distributed applications." -HOMEPAGE="http://hadoop.apache.org/" -SRC_URI="mirror://apache/hadoop/${MY_PN}/${MY_P}/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="mirror binchecks" -IUSE="" - -DEPEND="" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${MY_P}" -INSTALL_DIR=/opt/"${PN}" -DATA_DIR=/var/db/"${PN}" -export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf" - -src_install() { - dodir "${DATA_DIR}" - sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed" - - dodir "${INSTALL_DIR}" - mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed" - - # env file - cat > 99"${PN}" <<-EOF - PATH=${INSTALL_DIR}/bin - CONFIG_PROTECT=${INSTALL_DIR}/conf - EOF - doenvd 99"${PN}" || die "doenvd failed" - - cat > "${PN}" <<-EOF - #!/sbin/runscript - - opts="start stop restart" - - start() { - ${INSTALL_DIR}/bin/zkServer.sh start > /dev/null - } - - stop() { - ${INSTALL_DIR}/bin/zkServer.sh stop - } - - restart() { - ${INSTALL_DIR}/bin/zkServer.sh restart > /dev/null - } - - status() { - ${INSTALL_DIR}/bin/zkServer.sh status - } - EOF - doinitd "${PN}" || die "doinitd failed" -} - -pkg_postinst() { - elog "For info on configuration see http://hadoop.apache.org/${MY_PN}/docs/r${PV}" -} diff -r 90e704dfb755 -r cee7e5f9f250 sys-cluster/zookeeper/zookeeper-3.3.3.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sys-cluster/zookeeper/zookeeper-3.3.3.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,70 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils java-utils-2 + +MY_PN="${PN/apache-/}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="ZooKeeper is a high-performance coordination service for distributed applications." +HOMEPAGE="http://zookeeper.apache.org/" +SRC_URI="mirror://apache/${MY_PN}/${MY_P}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="mirror binchecks" +IUSE="" + +DEPEND="" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR=/opt/"${PN}" +DATA_DIR=/var/db/"${PN}" +export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf" + +src_install() { + dodir "${DATA_DIR}" + sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed" + + dodir "${INSTALL_DIR}" + mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed" + + # env file + cat > 99"${PN}" <<-EOF + PATH=${INSTALL_DIR}/bin + CONFIG_PROTECT=${INSTALL_DIR}/conf + EOF + doenvd 99"${PN}" || die "doenvd failed" + + cat > "${PN}" <<-EOF + #!/sbin/runscript + + opts="start stop restart" + + start() { + ${INSTALL_DIR}/bin/zkServer.sh start > /dev/null + } + + stop() { + ${INSTALL_DIR}/bin/zkServer.sh stop + } + + restart() { + ${INSTALL_DIR}/bin/zkServer.sh restart > /dev/null + } + + status() { + ${INSTALL_DIR}/bin/zkServer.sh status + } + EOF + doinitd "${PN}" || die "doinitd failed" +} + +pkg_postinst() { + elog "For info on configuration see http://hadoop.apache.org/${MY_PN}/docs/r${PV}" +}