Merge updates from master

7 files changed, 66 insertions, 139 deletions

diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
index ee6b0abe16ed..fdd4b7a4a7e6 100644
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/metadata.xml
@@ -9,10 +9,6 @@
 	<longdescription>
 	Fast, free, validating XML editor.
 	</longdescription>
-	<use>
-		<flag name="guidexml">Install GuideXML templates to work with Gentoo
-	official docs</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">xml-copy-editor</remote-id>
 	</upstream>
diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
index 5ba46b671f92..b8b09d59105c 100644
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@@ -1,5 +1,4 @@
-DIST aerospike-server-community-3.7.5-debian7.tgz 10810815 SHA256 9177bc49b732534371a27544adafa6792504b90ecb2e1992de7882ed7b221c32 SHA512 55b78b1992fac52f85d0405ae78b590b8af60880da0fc307570e13c2468f7e83fc1b61c3425e4c98fdb955c3d19c96c3f8e557f803c6d8154ec9d3fd453b2ca9 WHIRLPOOL 5569dd54bf68ee68ebb4bc709d8a5d816115781dd3a05997685c1408dfc1129e83f251b973c4f5e736a728998cf8f54543f9800214c9efe6077f1a92c5f40cee
-DIST aerospike-server-community-3.7.5.1-debian7.tgz 10811406 SHA256 8f6647c64a9431a7cdc92276ced5146fad6bba45d5cdec53474c739697ecf432 SHA512 125664a82f757ee647d80cf09f7874cec9cef2cb319dad2563b4aea7045c7797755474aacd3d35b52b1f0d1fd37cbf7ca85e985a3d0a29278ffa35fc92f13af2 WHIRLPOOL 1a8d55814567e49e1787de3d9b76641e4ff41a6dd15d913c6f93f3c6ec8e3a13f90c9365691bf8a74fb02c928eadc41ea9230b3137570e521bfc5312c2eeeda2
 DIST aerospike-server-community-3.8.1-debian7.tgz 10981771 SHA256 c10eaa991e24e256b5ce558ade94a6d7480a75a5de1ab78a7620757bf6e7bb7c SHA512 1f54d2dc7a2630981af749b25e4926cb52ab9b0396943e3d753457da79eadae1b4525abb5ebe878368bb5356a6727842a55b92a54d60db9215f696793a7bd6a6 WHIRLPOOL 282f17afeff5f3d458226848a6985b71abe4cf5c1f0eea6b39754fc54132be448e0823562d0522455fe2e467070eba374a0915977416a9e015d481e9b9354ae9
 DIST aerospike-server-community-3.8.1.2-debian7.tgz 10985656 SHA256 7b386b801e66ee66ae2e9dd2f10ef92035c49092d51e1c20420dbf1fa8fc42e8 SHA512 15d053b9f81d63155680c4cd9bd1f8e06b3ecbaaa99313b18ffd6e21a41d225508b5a5919a7c4d74e6ff33303dde75abee84964d560776712d2e1957f3638eb2 WHIRLPOOL d4570f8a370219b5ae0d36312627355c31925df896ef41e3527c73ddbf25cd386d06c387d86e599a4f53898f299db880d9373910522accb3b9d937abf29c5b27
 DIST aerospike-server-community-3.8.2.2-debian7.tgz 11011170 SHA256 0ac186e36889793ac1aeba3ab5a2cdb5c269fd9e6101b1ec9f2acae036569c0f SHA512 d8f2372e7e5f885697b232acb8fb002795fec73a4fc7765d567c49254923b71bc6faf527004dde3473a96c3f4c6c8f81d633207b603431acd0f1c22195cc57ec WHIRLPOOL c3791feef90133f785b7cc803a4866d0d90c8cf093a95aa048a163e1ca53612920481592c7b2388950dbed45d3c69fcc5223a9898bf97c53f1e838b57900e2a6
+DIST aerospike-server-community-3.8.2.4-debian7.tgz 11010893 SHA256 28f166dde56cab497bf2f3a962caa0f9b2ec43210ae5f6bf987c8f88d5dc38f7 SHA512 bbce8138c6c966881c87bd926e438dcff1f78824b319e66d6b78c0a1bcd50a980be259c4707fd0102647781f28fdab57b447ecaf19f5e809e4a924b3760f4177 WHIRLPOOL 66a37fecc92b1510548aa2cf31f619382c3d5b960fecff1e544ab3eff7421bb532d1df8bd60c92b8679347f680b3b0e25c116da5b4fd7da8aaf8e5bb74b816db
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.7.5.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.7.5.ebuild
deleted file mode 100644
index b240552ab9c1..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.7.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-${PV}.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.7.5.1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.8.2.4.ebuild
index 337a7011112f..f0436dca0236 100644
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.7.5.1.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.8.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ pkg_setup() {
 
 src_prepare() {
 	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.7.5.debian7.x86_64.deb"
+	local tools_deb="aerospike-tools-3.8.2.debian7.x86_64.deb"
 
 	ar x "${server_deb}" || die
 	tar xzf data.tar.gz && rm data.tar.gz || die
diff --git a/dev-scheme/slib/slib-3.2.2.ebuild b/dev-scheme/slib/slib-3.2.2.ebuild
index 634da06b620c..5cd17b9ded9c 100644
--- a/dev-scheme/slib/slib-3.2.2.ebuild
+++ b/dev-scheme/slib/slib-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SLIB"
 
 SLOT="0"
 LICENSE="public-domain BSD"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="" #test"
 
 #unzip for unpacking
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 957ff08c296b..a38472b1e846 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -165,6 +165,32 @@ fi
 #
 # EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
 
+# @ECLASS-VARIABLE: EGIT_SUBMODULES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array of inclusive and exclusive wildcards on submodule names,
+# stating which submodules are fetched and checked out. Exclusions
+# start with '-', and exclude previously matched submodules.
+#
+# If unset, all submodules are enabled. Empty list disables all
+# submodules. In order to use an exclude-only list, start the array
+# with '*'.
+#
+# Remember that wildcards need to be quoted in order to prevent filename
+# expansion.
+#
+# Examples:
+# @CODE
+# # Disable all submodules
+# EGIT_SUBMODULES=()
+#
+# # Include only foo and bar
+# EGIT_SUBMODULES=( foo bar )
+#
+# # Use all submodules except for test-* but include test-lib
+# EGIT_SUBMODULES=( '*' '-test-*' test-lib )
+# @CODE
+
 # @FUNCTION: _git-r3_env_setup
 # @INTERNAL
 # @DESCRIPTION:
@@ -205,6 +231,11 @@ _git-r3_env_setup() {
 			die "Invalid EGIT_MIN_CLONE_TYPE=${EGIT_MIN_CLONE_TYPE}"
 	esac
 
+	if [[ ${EGIT_SUBMODULES[@]+1} && $(declare -p EGIT_SUBMODULES) != "declare -a"* ]]
+	then
+		die 'EGIT_SUBMODULES must be an array.'
+	fi
+
 	local esc_pn livevar
 	esc_pn=${PN//[-+]/_}
 
@@ -243,7 +274,8 @@ _git-r3_env_setup() {
 	if [[ ${EGIT_HAS_SUBMODULES} ]]; then
 		eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs"
 		eerror "to switch the clone type in order to support submodules and therefore"
-		eerror "submodules are detected and fetched automatically."
+		eerror "submodules are detected and fetched automatically. If you need to"
+		eerror "disable or filter submodules, see EGIT_SUBMODULES."
 		die "EGIT_HAS_SUBMODULES is no longer necessary."
 	fi
 
@@ -357,6 +389,26 @@ _git-r3_set_submodules() {
 		l=${l#submodule.}
 		local subname=${l%%.url=*}
 
+		# filter out on EGIT_SUBMODULES
+		if declare -p EGIT_SUBMODULES &>/dev/null; then
+			local p l_res res=
+			for p in "${EGIT_SUBMODULES[@]}"; do
+				if [[ ${p} == -* ]]; then
+					p=${p#-}
+					l_res=
+				else
+					l_res=1
+				fi
+
+				[[ ${subname} == ${p} ]] && res=${l_res}
+			done
+
+			if [[ ! ${res} ]]; then
+				einfo "Skipping submodule \e[1m${subname}\e[22m"
+				continue
+			fi
+		fi
+
 		# skip modules that have 'update = none', bug #487262.
 		local upd=$(echo "${data}" | git config -f /dev/fd/0 \
 			submodule."${subname}".update)
@@ -434,42 +486,6 @@ _git-r3_is_local_repo() {
 	[[ ${uri} == file://* || ${uri} == /* ]]
 }
 
-# @FUNCTION: _git-r3_find_head
-# @USAGE: <head-ref>
-# @INTERNAL
-# @DESCRIPTION:
-# Given a ref to which remote HEAD was fetched, try to find
-# a branch matching the commit. Expects 'git show-ref'
-# or 'git ls-remote' output on stdin.
-_git-r3_find_head() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local head_ref=${1}
-	local head_hash=$(git rev-parse --verify "${1}" || die)
-	local matching_ref
-
-	# TODO: some transports support peeking at symbolic remote refs
-	# find a way to use that rather than guessing
-
-	# (based on guess_remote_head() in git-1.9.0/remote.c)
-	local h ref
-	while read h ref; do
-		# look for matching head
-		if [[ ${h} == ${head_hash} ]]; then
-			# either take the first matching ref, or master if it is there
-			if [[ ! ${matching_ref} || ${ref} == refs/heads/master ]]; then
-				matching_ref=${ref}
-			fi
-		fi
-	done
-
-	if [[ ! ${matching_ref} ]]; then
-		die "Unable to find a matching branch for remote HEAD (${head_hash})"
-	fi
-
-	echo "${matching_ref}"
-}
-
 # @FUNCTION: git-r3_fetch
 # @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]]
 # @DESCRIPTION:
@@ -651,26 +667,10 @@ git-r3_fetch() {
 		set -- "${fetch_command[@]}"
 		echo "${@}" >&2
 		if "${@}"; then
-			if [[ ${clone_type} == mirror ]]; then
-				# find remote HEAD and update our HEAD properly
-				git symbolic-ref HEAD \
-					"$(_git-r3_find_head refs/git-r3/HEAD \
-						< <(git show-ref --heads || die))" \
+			if [[ ${clone_type} == mirror || ${fetch_l} == HEAD ]]; then
+				# update our HEAD to match our remote HEAD ref
+				git symbolic-ref HEAD refs/git-r3/HEAD \
 						|| die "Unable to update HEAD"
-			else # single or shallow
-				if [[ ${fetch_l} == HEAD ]]; then
-					# find out what branch we fetched as HEAD
-					local head_branch=$(_git-r3_find_head \
-						refs/git-r3/HEAD \
-						< <(git ls-remote --heads "${r}" || die))
-
-					# and move it to its regular place
-					git update-ref --no-deref "${head_branch}" \
-						refs/git-r3/HEAD \
-						|| die "Unable to sync HEAD branch ${head_branch}"
-					git symbolic-ref HEAD "${head_branch}" \
-						|| die "Unable to update HEAD"
-				fi
 			fi
 
 			# now let's see what the user wants from us
@@ -806,9 +806,7 @@ git-r3_checkout() {
 		# setup 'alternates' to avoid copying objects
 		echo "${orig_repo}/objects" > "${GIT_DIR}"/objects/info/alternates || die
 		# now copy the refs
-		# [htn]* safely catches heads, tags, notes without complaining
-		# on non-existing ones, and omits internal 'git-r3' ref
-		cp -R "${orig_repo}"/refs/[htn]* "${GIT_DIR}"/refs/ || die
+		cp -R "${orig_repo}"/refs/* "${GIT_DIR}"/refs/ || die
 
 		# (no need to copy HEAD, we will set it via checkout)
 
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 5789168b501a..d8665bb5e540 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -9,7 +9,7 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS uk_UA vi zh_CN zh_TW"
 WX_GTK_VER="3.0"
 
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets git-2
+inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets git-r3
 
 DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
@@ -59,6 +59,9 @@ REQUIRED_USE="
 	|| ( alsa openal oss portaudio pulseaudio )
 "
 
+# submodules are used to pull in bundled libraries
+EGIT_SUBMODULES=()
+
 PATCHES=(
 	"${FILESDIR}/${PN}-3.2.2_p20160306-fix-luajit-unbundling.patch"
 	"${FILESDIR}/${PN}-3.2.2_p20160306-respect-user-compiler-flags.patch"