diff --git a/app-emulation/docker/docker-0.6.6.ebuild b/app-emulation/docker/docker-0.6.6.ebuild
new file mode 100644
index 000000000000..90e17cd79697
--- /dev/null
+++ b/app-emulation/docker/docker-0.6.6.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.6.6.ebuild,v 1.1 2013/11/11 06:19:00 gregkh Exp $
+
+EAPI=5
+
+DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level."
+HOMEPAGE="http://www.docker.io/"
+SRC_URI=""
+
+EGIT_REPO_URI="git://github.com/dotcloud/docker.git"
+if [[ ${PV} == *9999 ]]; then
+ KEYWORDS=""
+else
+ EGIT_COMMIT="v${PV}"
+ KEYWORDS="~amd64"
+fi
+
+inherit bash-completion-r1 git-2 linux-info systemd user
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc vim-syntax"
+
+CDEPEND="
+ >=dev-db/sqlite-3.7.9:3
+"
+DEPEND="
+ ${CDEPEND}
+ >=dev-lang/go-1.1.2
+ dev-vcs/git
+ dev-vcs/mercurial
+ doc? (
+ dev-python/sphinx
+ dev-python/sphinxcontrib-httpdomain
+ )
+"
+RDEPEND="
+ ${CDEPEND}
+ !app-emulation/lxc-docker-bin
+ >=app-arch/tar-1.26
+ >=sys-apps/iproute2-3.5
+ >=net-firewall/iptables-1.4
+ >=app-emulation/lxc-0.8
+ >=dev-vcs/git-1.7
+ >=app-arch/xz-utils-4.9
+ || (
+ sys-fs/aufs3
+ sys-kernel/aufs-sources
+ )
+"
+
+RESTRICT="strip"
+
+CONFIG_CHECK="
+ ~AUFS_FS
+ ~BRIDGE
+ ~MEMCG_SWAP
+ ~NETFILTER_XT_MATCH_ADDRTYPE
+ ~NF_NAT
+ ~NF_NAT_NEEDED
+"
+
+# TODO AUFS will be replaced with device-mapper (requires sys-fs/lvm2[thin]) in 0.7
+ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used"
+
+ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers"
+
+pkg_setup() {
+ check_extra_config
+}
+
+src_unpack() {
+ git-2_src_unpack
+}
+
+src_compile() {
+ export GOPATH="${WORKDIR}/gopath"
+ mkdir -p "$GOPATH" || die
+
+ # make sure docker itself is in our shiny new GOPATH
+ mkdir -p "${GOPATH}/src/github.com/dotcloud" || die
+ ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die
+
+ # we need our vendored deps, too
+ export GOPATH="$GOPATH:$(pwd -P)/vendor"
+
+ # time to build!
+ ./hack/make.sh dynbinary || die
+
+ if use doc; then
+ emake -C docs docs || die
+ fi
+}
+
+src_install() {
+ VERSION=$(cat VERSION)
+ newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
+ exeinto /usr/libexec/docker
+ newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
+
+ newinitd contrib/init/openrc/docker.initd docker
+ newconfd contrib/init/openrc/docker.confd docker
+
+ systemd_dounit contrib/init/systemd/docker.service
+
+ dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+ if use doc; then
+ dohtml -r docs/_build/html/*
+ fi
+
+ dobashcomp contrib/completion/bash/*
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles
+ doins -r contrib/vim-syntax/ftdetect
+ doins -r contrib/vim-syntax/syntax
+ fi
+
+ insinto /usr/share/${P}/contrib
+ doins contrib/README
+ cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/"
+}
+
+pkg_postinst() {
+ elog ""
+ elog "To use docker, the docker daemon must be running as root. To automatically"
+ elog "start the docker daemon at boot, add docker to the default runlevel:"
+ elog " rc-update add docker default"
+ elog "Similarly for systemd:"
+ elog " systemctl enable docker.service"
+ elog ""
+
+ # create docker group if the code checking for it in /etc/group exists
+ enewgroup docker
+
+ elog "To use docker as a non-root user, add yourself to the docker group."
+ elog ""
+
+ ewarn ""
+ ewarn "If you want your containers to have access to the public internet or even"
+ ewarn "the existing private network, IP Forwarding must be enabled:"
+ ewarn " sysctl -w net.ipv4.ip_forward=1"
+ ewarn "or more permanently:"
+ ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf"
+ ewarn "Please be mindful of the security implications of enabling IP Forwarding."
+ ewarn ""
+}
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index fb743611b8c9..a82741e410f1 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.9 2013/03/25 11:23:46 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.10 2013/11/11 08:14:10 jlec Exp $
EAPI="5"
inherit cmake-utils eutils multilib
@@ -12,7 +12,7 @@ SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND=">=app-i18n/ibus-1.3.7
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
DOCS="AUTHORS README TODO"
-mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=/usr/share/doc/${PF} all"
+mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all"
src_prepare() {
epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch" \
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml
index a12f4e05ca41..b3792c53d083 100644
--- a/app-i18n/ibus-qt/metadata.xml
+++ b/app-i18n/ibus-qt/metadata.xml
@@ -1,11 +1,11 @@
- cjk
- IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
+ cjk
+ IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides
full featured and user friendly input method user interface. It also may help
developers to develop input method easily.
-
- ibus
-
+
+ ibus
+
diff --git a/app-vim/syntastic/Manifest b/app-vim/syntastic/Manifest
index 0093253b8138..64789c447e23 100644
--- a/app-vim/syntastic/Manifest
+++ b/app-vim/syntastic/Manifest
@@ -1,2 +1,3 @@
DIST syntastic-3.0.0.tar.gz 148700 SHA256 d4b7b9165ff92f0125c7892a2b62b08de8af2a9cc273bf1deb4761a42e4fc659 SHA512 d9b52af57f2306f4142badeeab41c21ea8adbe0e6c8a656c05162a6807d28ad64467b8b7b4bd8c2231a8c39abc04990786cf70fb88c135d21decdd80847e0b2b WHIRLPOOL f6cc92a389728e0ffbbcdb8ca7d2abe65e3545f7df217bf74303ee17f483c0295b2a2f8a0dc4485c1ba234804f08ce163da95c53c1b53c838ff194c783e0f0b0
DIST syntastic-3.1.0.tar.gz 161157 SHA256 02517c569d2687b30beef5059219c05480e270569b287b730fad3ef0cb72bf94 SHA512 dfb15227530f3563d2dd4b0037ce164a340f53b43c1ac38fc0d56fa720c81d26c3dc280149af732e19a14192bd17006d2c299b1e4d2036f4c1162e2032787859 WHIRLPOOL 2f9202029247e3e9064d28ea88129d25f103d7376be0dfb29f56662fe52ca4ae216c1d017911db0256109fab5f513d721329d3fbd6de86a40ada739ac8c149f2
+DIST syntastic-3.2.0.tar.gz 161187 SHA256 250d88fbd90dee6099de13693454be70c038d3c87c815a1b87595571ffc97114 SHA512 413c2eb66a57f4d76c8bbb79340f9e0a6e46ae99ed40d5165166997463185f06f90da9131aac5f8fe3dadd1452cbc1eb38a7d978fafb49d01cc9548e23760c8e WHIRLPOOL b1173a3e1903df3a6857875149ed7bc19378dfda135c9353cf648dd62c5d30dde98119fe0b9c86a12c3438cbe7b0608ab605aa5cb45044c4a331bdfa4a703b71
diff --git a/app-vim/syntastic/syntastic-3.2.0.ebuild b/app-vim/syntastic/syntastic-3.2.0.ebuild
new file mode 100644
index 000000000000..211276e7bcf6
--- /dev/null
+++ b/app-vim/syntastic/syntastic-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/syntastic/syntastic-3.2.0.ebuild,v 1.1 2013/11/11 05:54:19 radhermit Exp $
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax checking using external tools"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
+SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="WTFPL-2"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ rm -r _assets LICENCE README.markdown || die
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Syntastic has many optional dependencies depending on the type"
+ elog "of syntax checking being performed. Look in the related files in"
+ elog "the syntax_checkers directory to help figure out what programs"
+ elog "different languages need."
+ fi
+}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
index 074527ee2b0a..eb3f631a7dcf 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.11 2012/11/28 15:54:24 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.12 2013/11/11 09:35:34 haubi Exp $
EAPI="4"
@@ -180,6 +180,16 @@ src_install() {
}
pkg_postinst() {
+ elog "${P} does not provide an sqlnet.ora"
+ elog "configuration file, redirecting oracle diagnostics for database-"
+ elog "and network-issues into ~USER/oradiag_USER/ instead."
+ elog "It should be safe to ignore this message in sqlnet.log there:"
+ elog " Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+ elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+ elog "If you want to directly analyse low-level debug info or don't want"
+ elog "to see it at all, so you really need an sqlnet.ora file, please"
+ elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+ elog ""
elog "TNS_ADMIN has been set to ${EROOT}etc/oracle by default,"
elog "put your tnsnames.ora there or configure TNS_ADMIN"
elog "to point to your user specific configuration."
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index b9087a6e1a88..fa2199f20634 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -3,3 +3,4 @@ DIST postgis-1.4.2.tar.gz 3276515 SHA256 5ce49b83b4c8f62eccb7080157f05299ff0e49c
DIST postgis-1.5.8.tar.gz 3948219 SHA256 4896fdae2f814b88c3ca458b7d01d7eca7e9aca021599c817919f131a1b0d804 SHA512 30167c56083dcd2aa764ee82b5b124992bfca2ab4eb8753a80f0fe624b310a060411f0714a8e56a1aebc277c3fdf8e1157d13d91560d5a8ffbc64917e9f3c727 WHIRLPOOL c889546679f69bbfc6d015c245721323c39fc18b6da2cfc28e24c7c736be112274f5c43d7d2ce61ea11a49011123d66d1a8f3c79ec3356227c48325945bff72a
DIST postgis-2.0.3.tar.gz 5581619 SHA256 7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0 SHA512 e49232a0aebd202a053e2f6cb741551e932e49a8c535fadd22fe15c654e3823c2f43a4c78dc0340cddbbc7f9298651dc16e1737be3bfe0779cc4feede032facc WHIRLPOOL 9c7985ab6d50a4a8ffa4e8fa5ea69c7e365aae8d90a3ea70c978149e5a9efe4a29a29d11db5d2a6b5c830dcd5ba458a3263288f32a5af54665f5d1cab3357415
DIST postgis-2.1.0.tar.gz 6518378 SHA256 fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c SHA512 ed5140aef0e68cb075fc06eaa91733c46d38ce4e01cbf1d97d14ff1a4d447f7cfcaf32924150946c7bb388d334bd5bc9f97753c47c84c16068b9dff6438e8493 WHIRLPOOL a52000a334dd2bb246b665ec7bcd743833c4699cb0cabdd1d9bab3538ee18df6e7b766c06728a97274647f63da1cc130f79902a32cf0621d9a3b8190c8fe596e
+DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945 SHA512 f85c4d1db32802b3acbda3f4c391ca961bf1301c699a00682265c7a984fbc74ee7b9fbfc5580fc04dff0491921eb6dbe4d8bd73dded216794a4b7f90c3ed650f WHIRLPOOL 807d0ce975b72315a72d4c2ecd192c612b00530a7e542b18429fed0c69cf6cb95285554c34be58e3d2a2c513f436289449dfbe82c7430fba87e901a4bea49c2d
diff --git a/dev-db/postgis/postgis-2.1.1.ebuild b/dev-db/postgis/postgis-2.1.1.ebuild
new file mode 100644
index 000000000000..e7cb7fc3e3b2
--- /dev/null
+++ b/dev-db/postgis/postgis-2.1.1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.1.ebuild,v 1.1 2013/11/11 07:23:59 patrick Exp $
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{0,1,2,3} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk test"
+
+RDEPEND="
+ || (
+ dev-db/postgresql-server:9.3
+ dev-db/postgresql-server:9.2
+ dev-db/postgresql-server:9.1
+ dev-db/postgresql-server:9.0
+ )
+ dev-libs/json-c
+ dev-libs/libxml2:2
+ >=sci-libs/geos-3.3.8
+ >=sci-libs/proj-4.6.0
+ >=sci-libs/gdal-1.10.0
+ gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.5
+ dev-libs/libxslt
+ || (
+ media-gfx/imagemagick[png]
+ media-gfx/graphicsmagick[imagemagick,png]
+ )
+ )
+ virtual/pkgconfig
+ test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc )"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+# Because developers have been fooled into thinking recursive make is a
+# good thing.
+MAKEOPTS="-j1"
+
+postgres_check_slot() {
+ if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+ die 'POSTGRES_COMPAT not declared.'
+ fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+ && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+ local res=$(echo ${POSTGRES_COMPAT[@]} \
+ | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+ if [[ "$res" -eq "0" ]] ; then
+ eerror "PostgreSQL slot must be set to one of: "
+ eerror " ${POSTGRES_COMPAT[@]}"
+ return 1
+ fi
+
+ return 0
+}
+
+pkg_pretend() {
+ postgres_check_slot || die
+}
+
+pkg_setup() {
+ postgres_check_slot || die
+ export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
+ "${FILESDIR}/${PN}-2.0-arflags.patch" \
+ "${FILESDIR}/${PN}-2.1-pkgconfig-json.patch"
+
+ local AT_M4DIR="macros"
+ eautoreconf
+}
+
+src_configure() {
+ local myargs=""
+ use gtk && myargs+=" --with-gui"
+ econf \
+ --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+ ${myargs}
+}
+
+src_compile() {
+ # Occasionally, builds fail because of out of order compilation.
+ # Otherwise, it'd be fine.
+ emake
+ emake -C topology
+
+ if use doc ; then
+ emake comments
+ emake cheatsheets
+ emake -C doc html
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use doc && emake DESTDIR="${D}" comments-install
+ emake -C topology DESTDIR="${D}" install
+ dobin ./utils/postgis_restore.pl
+
+ dodoc CREDITS TODO loader/README.* doc/*txt
+
+ use doc && dohtml -r doc/html/*
+
+ docinto topology
+ dodoc topology/{TODO,README}
+
+ insinto /etc
+ doins "${FILESDIR}/postgis_dbs"
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "To finish installing or updating PostGIS edit:"
+ elog " ${EROOT%/}/etc/postgis_dbs"
+ elog
+ elog "Then, run:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config(){
+ source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
+ source "${EROOT%/}/etc/postgis_dbs"
+ local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
+
+ if [[ -n ${configured} ]] ; then
+ einfon "Password for PostgreSQL user '${pguser}': "
+ read -s PGPASSWORD
+ export PGPASSWORD
+ echo
+ else
+ eerror "You must edit:"
+ eerror " ${EROOT%/}/etc/postgis_dbs"
+ eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
+ eerror
+ die "Edit postgis_dbs"
+ fi
+
+ # The server we work with must be the same slot we built against.
+ local server_version
+ server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
+ -Aqwtc 'SELECT version()' 2> /dev/null)
+ if [[ $? = 0 ]] ; then
+ server_version=$(echo ${server_version} | cut -d " " -f 2 | \
+ cut -d "." -f -2 | tr -d .)
+ if [[ $server_version != ${PGSLOT//.} ]] ; then
+ unset PGPASSWORD
+ eerror "Server version must be ${PGSLOT}.x"
+ die "Server version isn't ${PGSLOT}.x"
+ fi
+ else
+ unset PGPASSWORD
+ eerror "Is the server running?"
+ die "Couldn't connect to server."
+ fi
+
+ local retval
+ safe_exit() {
+ unset PGPASSWORD
+ sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+ eend $retval
+ eerror "All actions could not be performed."
+ eerror "Read above to see what failed."
+ eerror "Once you fix the issue, you'll need to edit:"
+ eerror " ${EROOT%/}/etc/postgis_dbs"
+ eerror "As some things may have succeeded."
+ eerror
+ die "All actions could not be performed"
+ }
+
+ local db
+ for db in ${databases[@]} ; do
+ ebegin "Performing CREATE LANGUAGE on ${db}"
+ createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+ retval=$?
+ # In this case, only error code 1 is fatal
+ [[ $retval == 1 ]] && safe_exit || eend 0
+
+ ebegin "Enabling PostGIS on ${db}"
+ psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+ -f "${postgis_path}/postgis.sql"
+ retval=$?
+ [[ $retval == 0 ]] && eend 0 || safe_exit
+ done
+
+ for db in ${templates[@]} ; do
+ ebegin "Creating template database '${db}'"
+ createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
+ ${db} "PostGIS Template"
+ retval=$?
+ [[ $retval != 0 ]] && safe_exit
+
+ psql -q -U ${pguser} -p ${PGPORT} -c \
+ "UPDATE pg_database \
+ SET datistemplate = TRUE, datallowconn = TRUE \
+ WHERE datname = '${db}'"
+ retval=$?
+ [[ $retval != 0 ]] && safe_exit
+
+ createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+ retval=$?
+ # In this case, only error code 1 is fatal
+ [[ $retval == 1 ]] && safe_exit
+
+ psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+ -f "${postgis_path}/postgis.sql"
+ retval=$?
+ [[ $retval == 0 ]] && eend 0 || safe_exit
+ done
+
+ for db in ${epsg_databases[@]} ; do
+ ebegin "Adding EPSG to ${db}"
+ psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+ -f "${postgis_path}/spatial_ref_sys.sql"
+ retval=$?
+ [[ $retval == 0 ]] && eend 0 || safe_exit
+ done
+
+ for db in ${comment_databases[@]} ; do
+ ebegin "Adding comments on ${db}"
+ local comment_file
+ for comment_file in "${postgis_path}"/*_comments.sql ; do
+ psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
+ retval=$?
+ [[ $retval == 0 ]] && continue || safe_exit
+ done
+ eend 0
+ done
+
+ for db in ${upgrade_from_1_3[@]} ; do
+ ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
+ psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+ -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
+ retval=$?
+ [[ $retval == 0 ]] && eend 0 || safe_exit
+ done
+
+ for db in ${upgrade_from_1_4[@]} ; do
+ ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
+ psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+ -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
+ retval=$?
+ [[ $retval == 0 ]] && eend 0 || safe_exit
+ done
+
+ for db in ${upgrade_from_1_5[@]} ; do
+ ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
+ psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+ -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
+ retval=$?
+ [[ $retval == 0 ]] && eend 0 || safe_exit
+ done
+
+ # Clean up and make it so the user has to edit postgis_dbs again that
+ # way this script won't step on any toes due to user error.
+ unset PGPASSWORD
+ sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+ einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
+ einfo
+ einfo "To enable other databases, change the default slot:"
+ einfo " postgresql-config set "
+ einfo "Then, emerge this package again:"
+ einfo " emerge -av =${CATEGORY}/${PF}"
+}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index a7839d070153..80d1690d23ac 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -8,11 +8,14 @@ DIST icedtea-bin-core-7.2.3.9-amd64.tar.bz2 48908349 SHA256 c68cbee3c975dcbf6c59
DIST icedtea-bin-core-7.2.3.9-x86.tar.bz2 49961411 SHA256 1d29372e92d2b8c30ecfb095d02aa137483870445c173554d805c6903a19a51d SHA512 62dc6f5bbc682186698b7323d1250dc68c8981fb813641ce0f98d13a1ae2227b0664ce88104c0dccc6d325e7b7a8b000a0de5248c392ebc91e7b77aba9c3ccf3 WHIRLPOOL c03267892e27eff774444b87df9b2857ec7ceb9346d849ce498e4221b45d2fb0a9e2c2f8fc261db745ed9e3f6b9f27e5e9465b7ad7bd8489a300802b0fbf2660
DIST icedtea-bin-core-7.2.4.1-amd64.tar.bz2 55285444 SHA256 73474d584b4887cd7bc0d3432ccfae03fc7508bcfa957434ea471c056243a8f3 SHA512 3c53f7eadc7a10fbd34a15cbad202335b83ad64d6b8a373f7bfa6bc855c615c534f2891d464e8ee80492ec5bf121c9674958d885b3a9cc8a3d3397649fe59796 WHIRLPOOL 5ce33c5598c44163cca8ae95b72b1614482237f92e73ce27aab43428f789fa0bd5dbc702532948385a27dc96ff9dfe88c33792c36c553398b8b22060b9f3dd60
DIST icedtea-bin-core-7.2.4.1-x86.tar.bz2 56202053 SHA256 c24524c49a26d2834cc6507a2b90cfa3df15efa0da84e25ac882e3d7ec11855d SHA512 68cf166000cc7bcd8cb86b00002706a1f9e8f10c08ae9c0ed18210773547d5d6b416de989305b0fa4aef0f56b2d4585e70bac071a2fa75cffbcf327449bcb278 WHIRLPOOL fe12919bc0e1a09df2b3793a3bea4600d04dbe3e1c0463d4d5172fc3247b8360df85a69f975a004924c06bbae859cf8fe6f8e37cdb12fe72016eea87ef660987
+DIST icedtea-bin-core-7.2.4.3-amd64.tar.bz2 55422804 SHA256 ca7718a23a71c9dfb545b7823f571e3fc3e1beaa71765dc393ead9083a26397f SHA512 f5cda0d975d44b4f3d4e6d9014a509d2e2efc4e4615246db36bde564f8c30cb22dea728bba3b6e1f7fe875341e28d1707b3912ac813a4271b2740c22c82b740c WHIRLPOOL 123e5ddefddaf4e1e628a630efbc37cdf8d84df4119b324fb62738cb372eda417dbb469bbba846f930c1b1a8904f1eac0bbddaf4fc9447f5e665c2283ca57d0a
+DIST icedtea-bin-core-7.2.4.3-x86.tar.bz2 56381315 SHA256 ca1534b55d0116ddd1d67ac28c817768a92c4f1cad108bb930c2d424180e7c14 SHA512 9ce6c476e07d84ee9a6cb065d31d94dfb8f95575df87194f038351a4443ba8d32edb0e8ea450bb1cd573581fc9beaa56908076486250d5d45ce6d16223e641b9 WHIRLPOOL 204dea72b422d00e9de04248296340662a373598e52b40b343d2a2ddb7c3a3c758da9e9005b3148cf2bcba668d1f9a98933f56a05783e6a135df21f5d46da595
DIST icedtea-bin-doc-6.1.12.5.tar.bz2 11636972 SHA256 386bdb4ff2018335b18336f5353c78b14f0bbd5efe03e1faee64e32dfed07545 SHA512 baaf51c3b11572453e1e372c947773310c6861564e29e86f237fb8fbcb084612e2f66ba742ef593d2199b9d20f2a9cc34f010a364d5df67eff28feeaec7b1dc0 WHIRLPOOL 490a3531b13e30f81d7ba4a5da61ce84b366e3e5e1e45dba0b596833fc23b58a3493e1bd6070723997a6c9ea0bed8ac7a4028895aee8acf4bc87e39e34965b12
DIST icedtea-bin-doc-6.1.12.6-r1.tar.bz2 11508624 SHA256 b6281fe03e026d24737cd2d13012abe0acdbf06a8b77932eb6e39e35a593bb02 SHA512 60fc78546fe87ea87685029b3cd7fc7b690c421e585b01cd264e62ce03b9a259d13db2ed57a49cd6ae315656001f1ded69832dc358a99263a96b579d8db59eaa WHIRLPOOL 0952b3db223865eedcdd5d7d569572108d5513ae2c21be8afab509d794c93d557fee56c87ca034cb6a9e9da15f1694549776a5bda8c092673ef88b70bdf94c58
DIST icedtea-bin-doc-6.1.12.6.tar.bz2 11508707 SHA256 61a4ba5c97d628536d06f0e6c888307851a933ed39e3e46fda2b548f9ec34dda SHA512 35bea98900a9edf539471760914e6d1b3a3b01748d916176004c4f10bf712b5630070acd62f3c079d2470f3edae05508279fe7b72e41b4931852cd2150f7bbe0 WHIRLPOOL fead05c0b1cda5ec63c47b44a6eb8645088ce79690dc03e04ce66ed30a7026fdac020bf03f20d1892e5c1be207fb1b0fd7fd8f6293f74e7eca3be6a9e8a06030
DIST icedtea-bin-doc-7.2.3.9.tar.bz2 12531939 SHA256 0c19ead603888b8f83f7b5f72048f83d18d3cb6f31391dcda02e2e74380e7164 SHA512 4965b6f7e0cd59dc26681933b89a302e5b9384ba26126873c9dc1f97c98a96c34caceeff2682a17fd60ef36a75f44dcf7f5ffbad9c17d98bee95cd59fb19fc0e WHIRLPOOL 03500cc4bc64bf5fef13380b6a957844c739ab1093710e0fc3c1a1313e74527a6efc6970968621d69c268e838637bbbc3cba8dc9edccb2915ad5432eb3e1ea3b
DIST icedtea-bin-doc-7.2.4.1.tar.bz2 12539926 SHA256 2003a7e4a26d09cb0737f5b03ebc647d4c250b18a441d90cb07c294e7b5c5330 SHA512 56968c730dddb081b76c94a384320ac82d6d91fd477783d1caf2c2d5f096ab536c68f89255247451a560e10976d42bad3e33ed179199264c1717aecbb5911c67 WHIRLPOOL 2a173dc70eb71704d7dd0be611b60f7cef05ec42799f7744d1b7434a6a1186fae9966e4823bba93b7cf342ff4ee15197b106a3058f9fa5f8c1440d28827b74f6
+DIST icedtea-bin-doc-7.2.4.3.tar.bz2 12537197 SHA256 0224d2c77cb7e7c4ad6c347e2fec45f33c1f5284292e049f8ba5c4997e653feb SHA512 7f89c5b505fdf2b9660b07f75a1cb78c9f65800fedf5cd82871da48cd2c581ee9a01c3b11da226211571f51d9f00e73a9c97157305c3c757255eb28b7fc9abbd WHIRLPOOL 174ac81168c3bbafce848f6fe013dae2ea4716f43f5cceec8145b2905eb054cd619999722920d1d1c98850badf7b2c38c22c21f1b238bccbfeb6d1f426f52309
DIST icedtea-bin-examples-6.1.12.5-amd64.tar.bz2 2164585 SHA256 1b4f33e45e20f4a3bf1d1a45fe260940fa0c0ff17627e462ee5bdf85e5438fe3 SHA512 2dc3db0e9e98c5eeb4436dcb75b52039228a0f57ed6303e1fd3116503c13083c1653c07039ac7fd24d7f95d572ac4237871080a7b70804484dc1c7222827f722 WHIRLPOOL 6070c4df104df9262758b9e7ff7108a5e32163b310cd1f3b59867de95f5b2c7dc498b4538a9e973ec396b8869d31c421b802e57efc90bd11e145321077728ea8
DIST icedtea-bin-examples-6.1.12.5-x86.tar.bz2 2133457 SHA256 dbaef31b47cc854970481a8b7cb6411d252cc4d010763c8dcb1505a7ea1f9918 SHA512 1f71fb03df90d8e15e29a5b79a31c319d364e60b29c472bc893d14e52f87b89f28bab97011c1ccc5360c16009f22f2f4d7a6c81b4c8116beb124b87d8f064606 WHIRLPOOL 108b42ee95f4e1d470a2060c0e4fb701643b5ee62bd673375d05cd903fe53d404ef72a6cc9d8b03c1a9b3b697aa0b1e94faaf82d49a9451cef3b636f0d3864b5
DIST icedtea-bin-examples-6.1.12.6-amd64.tar.bz2 2164759 SHA256 13a579c606233ba7a696acc3baeb8b4eecc954103c7b9cb70c141b13f00805ac SHA512 2d9ae2f6cb64548553d66f4766e0aa15f61b22667700e031445221b07f5d8bea8ad59178528e2bf93185d34638bf354898280e261b00a855b292b4bef7a5da89 WHIRLPOOL d8ca6872687cf8b1279abad0ad810773dbdb49b4bcee550cbae0f1d7a8933f67022b9f5e77b7052ff40023a302e1fe11263ba1b666e7064abb2e9c2f3caed748
@@ -23,6 +26,8 @@ DIST icedtea-bin-examples-7.2.3.9-amd64.tar.bz2 2334505 SHA256 eff5c9f48ebeef91d
DIST icedtea-bin-examples-7.2.3.9-x86.tar.bz2 2313247 SHA256 834c9d0fd4851a27e0c9a7a83ceb144e0414a8f49e15c2ffb11fef7f83da4f13 SHA512 cba7698fae6879c2ad0ea008b3cc069663e79faf93fb64b3f84a4ed1d97b6938ee8cf470b31f2f57e068e683000defcff89d2de95f347b2f6436ce35d757be6b WHIRLPOOL 120e6167895b70efd88aaf7146eaa58e77d868c7860ecf6e535c2db32ff3caff63e693c631c3a6cb52db6c50c3c31ef87fc3f0bb222cc992d6917b5d591f8e0d
DIST icedtea-bin-examples-7.2.4.1-amd64.tar.bz2 2338604 SHA256 bc33efc83b64e5e84941dfd5a6e5f59392d1279c787f6df861973295fbb8e349 SHA512 8d78e465be5d8118f23176eeab5605ab7957f807224454e41ac57f9941d0ac911f576251a0025ee5886917227a2c0cbc6f2b14eef6f24959f85fae2f775e3151 WHIRLPOOL 8cd2bdc5676d0007e2f29600d59a571f9eeedf1e604b08a36d2f4a8bc4ef5b7c7df88b473ff4d433eb16fe4c325114512cf803933f547c970cdf4cdbe39dbd0c
DIST icedtea-bin-examples-7.2.4.1-x86.tar.bz2 2316271 SHA256 20377e48e034c4051c309d2892579e36a656c879b36caa0e3033a42a54140b2b SHA512 5282c1be6a8c09e29a67f519fb4cfed3bc6fc94a1fc2a2b5bd7e4ca539ae42a8e0ee0a73c07f05763f4ff3914f41d1852d3311d8e6f049b3f5abf77cc8e06db7 WHIRLPOOL 0510e67f07962ed6a33ccd7fd2140168795707d005fb73ec28df8c1d41d7c9eb563bca10ba27a108750139697a936ae545933c4e5472134a2bbbd77caa448a9c
+DIST icedtea-bin-examples-7.2.4.3-amd64.tar.bz2 2337892 SHA256 17d9f0f9a9c7708f18276e826b153c6dc81fd26395f74ffad95f12b40eea9c5b SHA512 49631f1c51eb4e166066fbc1f5cd731ae86f2fc8711c0251ced127fcbdc6305e7f95ecb109face22609aa610397c096f272065012791ac06549254f1317fb2b4 WHIRLPOOL 32189faf1db2740bff49f569a1823aa4d339d0892adc0bd5b84f418907089e1675dc030266a237a05021913480e9bc006c335533468fc1e38fd3bc6f512875a5
+DIST icedtea-bin-examples-7.2.4.3-x86.tar.bz2 2316272 SHA256 157eedd1d3f1099361dfac766031b04b4196f49fa67868d5853e1718f0bbea44 SHA512 1ee7bfee0fbe22916f233ef9249e235b8cd3875947148a0c4899d59a845c1b1a9484bdb5c07c7252233d2d45d5d9a4da63e72550fbaae3b46f9ec4c81cbb5163 WHIRLPOOL 669ea44dd6f6565158a2d49c676fc8fe40a32cecc190db32178a170eab4d535ed5a44d8cbea6eb5bd6b4f91e4e65d340f8152f8f9a5971399e428f2f1b032267
DIST icedtea-bin-libpng15-6.1.12.5-amd64.tar.bz2 18653 SHA256 5e53f6f2909572fa344978c1e7d1bc607d13d27ce77f80de20363b505fb2e39e SHA512 3e1f3fe42bae2394681161978a16835292437749f0f8e9c0256077536fa77c39350fb1fe08c6dfdb42c2c34ca505677e5dcfb1972aba7a220c18250d7bf386f9 WHIRLPOOL 391caceb3ff017b437f2e746a2d399d29e47f88f2af6d7332ca43d11e871798e5bf1da513961bacbd34b0acbefe312649f91fc5fa44ce0bf5f1ad8b046a3e413
DIST icedtea-bin-libpng15-6.1.12.5-x86.tar.bz2 17216 SHA256 69d6efc0da4625bf89aecd9e5fcbf92ab2e5c49f38c4c035a7ea45b6be4927fd SHA512 372ce6b24a121d5f7d075ae3832eb9ae928699aba254660025a70293edc962790f02d8003ad9367adcae8190163892ba29e02a213a7497d23834af2e938c9c70 WHIRLPOOL ea08f0b69249df06362a0b24f4d156537fd1ffe12491bc190f4988ca107f94d6d35a01d43f300ec2e44405897badbe6afad1a1a9f745888b9a0145beeb16681b
DIST icedtea-bin-libpng15-6.1.12.6-amd64.tar.bz2 18742 SHA256 f2657ef130e7b6bac86231d43f635a9d4bf9f6ce2bb2ebe55b7cb34b9ac5fb3c SHA512 971f7cc84710cc589b27e694f989627b38cbf37d2a526601cdd773c0a0052b58ffc4249b2b0aeac2d2036d8fcf08eb209c0b9bca754a8426c3f40a1f71ba41bc WHIRLPOOL 334bfe13da72a83dd5c127c9247e7784aae8964858fa65b2495f0ff1729e403f3fc51628de662c6977fa4a9d6eaffa040ce3a46ee8ca430178b6308af258b058
@@ -33,6 +38,8 @@ DIST icedtea-bin-libpng15-7.2.3.9-amd64.tar.bz2 18791 SHA256 5e121b3f5c7ef2d549e
DIST icedtea-bin-libpng15-7.2.3.9-x86.tar.bz2 17313 SHA256 32fcd8f960d7ea8f39e33e52a1ffc2bed1552ddbe6475d5d0d81450a40c6ba87 SHA512 bc8781cd5c14150e83de9a784233ef3554764a121ce36903d342cceecdd689f2a93ec354c2891787a56fbd54b96cfb8b4d279acecebb303dc92c95eec6068bff WHIRLPOOL a14b1986857fbfa429d98cdba14408d06e2e8c6d5ea0338f31425b4ec1f804385f25c0f3b6b36cb9a06a291f9065643a8d798dcc0f8f20b8ef51ccf63af564c8
DIST icedtea-bin-libpng15-7.2.4.1-amd64.tar.bz2 19287 SHA256 292179fe1b2b1c41c9ad52e068a32dae470c1deada73cc99f3fb29ae97d75183 SHA512 c42b05737f5f6b2fd52ad5f21edf3c2022ab2480cebc77284be668e3e92342e0ce53f18d1adecabc95468549a70170bdacb97cc3ee2df341bff5a294d9045e08 WHIRLPOOL 682f3696372e0603ea70f070b593c91fd0ba1d08760122636f8c0db2026dcb309e58c0965fb337a26644736e0dee2150f2d38812ae78a2cb726119ba65f822f5
DIST icedtea-bin-libpng15-7.2.4.1-x86.tar.bz2 17600 SHA256 98b624850e8a6c21e7c4c3f7f630a75c26c7aa844e098f9503f4010d8681437f SHA512 3b82b05194418e05b711ff30c265f6c75d737708c1aab428e24b062ec3d927c5219252f733f94684cfc4e19065c358511b3ee86350e981ab0291c000f3de18e5 WHIRLPOOL 2e4fbb2f594c930f9bb0448324458bfb7fed154476e85038f909ab295091f69c856d43102dfa41a43d997f8a1c4518ececc9f4667c560bc46958be0bac98a424
+DIST icedtea-bin-libpng15-7.2.4.3-amd64.tar.bz2 19296 SHA256 2e70c3a8e6bdeb99a6cdb5f0ab51882928fe8cd17c76ebc98cb57495817e2857 SHA512 5e36d99bde62b2baba67b7148675f0ab149d439aa772cf8980754d45ef3d8f47a6d187d61379618e395681657e3af2983f322fc4610a6f6df46921f1572f997c WHIRLPOOL 57af32d50e07cb7d6b760b44a88579d4d0c740c36f5b73563b293c371c003eef67995a13f8a21b2e396d72c469f816a0cab2e93a15d267bd04f89c9e01b32b9b
+DIST icedtea-bin-libpng15-7.2.4.3-x86.tar.bz2 17595 SHA256 fc24cf5b78c15ddc11cf6eabeb6b8a0cf31afc643d8f89a30ce975c5ecbe415b SHA512 19b027d4ffdea84af41fab2a1b579b013974314b929f4d100096247a3a7e1649ec018efa5890dedd7d0596da6baf3cd545b76e8886638c5f1697c7374269e557 WHIRLPOOL 411ed66355f564196a693734ded8c687903222790f256b4b6b784232dd73e9cb32075de6f60e54fa7469be244c9eac1379f92e52bc0f95647b020804d90e298b
DIST icedtea-bin-nsplugin-6.1.12.5-amd64.tar.bz2 1013357 SHA256 38094f24078fd09d460fc317a990eb81ba20c24d18dbf3fea7f2d97448d1dbb0 SHA512 6f1f3e7abca8dff0d6722d39a6019a8e336b0b9611fce0a35085c89b79a86f1d4d63f5e58505b99e24c167296f316c335daea1d77cca4f5ec0bdf41a2055a67a WHIRLPOOL 4a2df3bf4362cde0ca21d5f388f252214cadf06ccafc31f2f04d9af1deef4b915181d8d12b6ce4ba9163a361b2a941a456591baa9af9ebf94d09abd708c8c19b
DIST icedtea-bin-nsplugin-6.1.12.5-x86.tar.bz2 1007318 SHA256 53acefe757e2c1983a3e9828f611331afa79de89d5ae99cd38bcda30f5a67a4f SHA512 6b2413fa0afa41525aa9d5dda44512f673f6035f82b65e78f64072cda0553f809185dd3c019e6252ab39bc532674b85a7f5094fb18409d64111e687a290a3f74 WHIRLPOOL f892a5adda33708ba350968b7910e2dc6e7cee4665fa2460157823526c588769da82c5c5ff06ef9a0f3866dd727b8d1ea94c52234db14035375dab4d8429a17e
DIST icedtea-bin-nsplugin-6.1.12.6-amd64.tar.bz2 1020025 SHA256 e2dc553bede3d11a2ff1a2b6090f74090edfef8b82e4990c7d22d2719844afb6 SHA512 d70bda0c067b857aaf93c17ce79365f2bc612fdad1615fcedf02e43b714a735d17f5304645804b73158eec09b41e6bd92a467e1073bee6d43f4610eef6bef1ef WHIRLPOOL 95aa6307efe8f6e5a21d802d1b0017d5e54665623ea3ca47b8bd06d0ad5034acf31e031306f327e5ed9c33f6a5756c6a03167ce1d8004d5fa193aa578821b79e
@@ -48,3 +55,4 @@ DIST icedtea-bin-src-6.1.12.6-r1.tar.bz2 40954502 SHA256 99f162075d5164197a4ad1d
DIST icedtea-bin-src-6.1.12.6.tar.bz2 40956483 SHA256 883288b50cb3548341986b59d859fb2575a293499e83a6b26a5493bb3f719d8a SHA512 613635c29fde0b9dfc105f561de460de69b5c635562950e74795ce37efc4ac51ed865b816df0db8c32713cdeda5a0e974a68628009e2001ab7f42a10f9abd9b6 WHIRLPOOL 0ea4e4462ed0634c5fc06784cb4ab4f2f565237a3acd5f4ea6986a63ee9c0390c2fcfbd6ebf9f8a6c21f6c82f72c215b63700a6c77bffcd0021bd09b7854d54f
DIST icedtea-bin-src-7.2.3.9.tar.bz2 41269870 SHA256 4d5699da20189244312f618bdc0039b816cfaaed777bf1971084d55942880ad0 SHA512 52bb50083e997d73ab2f7bba5e097f5cbfbcc114c0c8eb20fcf81b8b24662ab3e12da3bbacdac3d92f24d0ef8a8cdcf761a6e4a191f975f43aeb8c0e391784af WHIRLPOOL b4c4f1aa5d3c2fafcbed6fa2936e6b9dfcb5a743488188c63079dc406744a260b9668a649f8bf78da04060da981d86123f575a7512c36f875674dcf93284d797
DIST icedtea-bin-src-7.2.4.1.tar.bz2 41280241 SHA256 62cd85c7a25eff445200767ca850e02155ed86c1640a1afe81568368782f8f44 SHA512 b614b1beaf1bdda5274e078739cf340178878ed25d624fc1e2b61db01cc19b942d63bf69562266a6c913f5d70db3fef109e8aec30ebe36c10aebc221018f19c1 WHIRLPOOL 122968ee108ea9d3c946776411cb9c5ea0d49fcff2c816bfe7300ed2dcae1176265853d42753ee52a236ca3a1610750d6806448cec4aa8319253aa61044d8271
+DIST icedtea-bin-src-7.2.4.3.tar.bz2 41348380 SHA256 e9944fac46c7333c4c5065f346f0e181591c5f38031cae50cc4668118721f823 SHA512 ca7e7e07c8f942de9129e9c8cb613bb634cee95ff6a490bdd12d953aeb7fea1096b3cf827cceff345194f7059f777c38e39c9d2a4ab72391f1c938391fd39058 WHIRLPOOL 142ff86fcdbc3c3a0d3ed6b8d74956e774390bf424c24b0a150e3ee167351b017338802e6a45713156799e341821c65b2bbefeaf19a73c04d860594c4facf7c2
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.4.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.4.3.ebuild
new file mode 100644
index 000000000000..c38606c97355
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.4.3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.3.ebuild,v 1.1 2013/11/11 07:08:10 caster Exp $
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix versionator
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+ amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
+ ${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
+ x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
+ ${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
+ doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+ examples? (
+ amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+ x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+ )
+ source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.4"
+X_COMMON_DEP="
+ >=dev-libs/atk-1.30.0
+ >=dev-libs/glib-2.20.5:2
+ >=media-libs/fontconfig-2.6.0-r2:1.0
+ >=media-libs/freetype-2.4.9:2
+ >=x11-libs/cairo-1.8.8
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.24:2
+ >=x11-libs/libX11-1.4
+ >=x11-libs/libXext-1.3
+ >=x11-libs/libXi-1.6
+ x11-libs/libXrender
+ >=x11-libs/libXtst-1.2
+ >=x11-libs/pango-1.24.5"
+
+COMMON_DEP="
+ >=media-libs/giflib-4.1.6-r1
+ media-libs/lcms:2
+ >=media-libs/libpng-1.5:0=
+ >=sys-devel/gcc-4.5.4
+ >=sys-libs/glibc-2.15
+ >=sys-libs/zlib-1.2.3-r1
+ || ( virtual/jpeg:62 media-libs/jpeg:62 )"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+ X? (
+ ${CUPS_COMMON_DEP}
+ ${X_COMMON_DEP}
+ media-fonts/dejavu
+ cjk? (
+ media-fonts/arphicfonts
+ media-fonts/baekmuk-fonts
+ media-fonts/lklug
+ media-fonts/lohit-fonts
+ media-fonts/sazanami
+ )
+ )
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cups? ( ${CUPS_COMMON_DEP} )"
+
+PDEPEND="nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )"
+
+src_unpack() {
+ unpack ${A}
+
+ if has_version '=media-libs/libpng-1.5*:0'; then
+ einfo "Installing libpng-1.5 ABI version"
+ local arch=${ARCH}
+ use x86 && arch=i386
+ mv -v ${PN}-libpng15-${PV}/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
+ else
+ einfo "Installing libpng-1.6 ABI version"
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest}"
+ dodir "${dest}"
+
+ # Ensures HeadlessGraphicsEnvironment is used.
+ if ! use X; then
+ rm -r jre/lib/$(get_system_arch)/xawt || die
+ fi
+
+ # doins can't handle symlinks.
+ cp -pRP bin include jre lib man "${ddest}" || die
+
+ # Remove on next bump as the needed marks are already set by icedtea ebuild.
+ java-vm_set-pax-markings "${ddest}"
+
+ dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+ if use doc; then
+ dohtml -r ../doc/html/*
+ fi
+
+ if use examples; then
+ cp -pRP share/{demo,sample} "${ddest}" || die
+ fi
+
+ if use source; then
+ cp src.zip "${ddest}" || die
+ fi
+
+ # Remove after next bump, handled by icedtea ebuild. Bug 390663
+ cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+ eprefixify "${T}"/fontconfig.Gentoo.properties
+ insinto "${dest}"/jre/lib
+ doins "${T}"/fontconfig.Gentoo.properties
+
+ set_java_env
+ java-vm_revdep-mask "${dest}"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ if use nsplugin; then
+ if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+ elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+ elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+ elog "The switch should complete properly during the subsequent installation of icedtea-web"
+ elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+ fi
+ fi
+
+ # Set as default VM if none exists
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild
index d79c76032cd0..f3087d133656 100644
--- a/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild,v 1.2 2013/11/09 11:55:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.1.ebuild,v 1.3 2013/11/11 07:05:55 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="5"
@@ -15,13 +15,16 @@ LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc javascript +nsplugin test"
+IUSE="doc +icedtea7 javascript +nsplugin test"
COMMON_DEP="
- || (
+ icedtea7? ( || (
+ dev-java/icedtea:7 dev-java/icedtea-bin:7
+ ) )
+ !icedtea7? ( || (
dev-java/icedtea:7 dev-java/icedtea-bin:7
dev-java/icedtea:6 dev-java/icedtea-bin:6
- )
+ ) )
app-admin/eselect-java
nsplugin? (
>=dev-libs/glib-2.16
@@ -36,7 +39,10 @@ DEPEND="${COMMON_DEP}
# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html
pkg_setup() {
- JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7 icedtea-6 icedtea-bin-6"
+ JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7"
+ if ! use icedtea7; then
+ JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6"
+ fi
JAVA_PKG_WANT_SOURCE="1.6"
JAVA_PKG_WANT_TARGET="1.6"
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
index 7ad86bf37b39..d2acb1b2f067 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -7,6 +7,7 @@