Merge remote-tracking branch 'remotes/Coacher/aegisub-3.0.4-fix-install-with-empty-LINGUAS'

Pull request: https://github.com/gentoo/gentoo/pull/585

18 files changed, 410 insertions, 57 deletions

diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index ce66c9a5baa8..32dff7bc29ac 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,3 +1,4 @@
 DIST APCu-4.0.7.tgz 118670 SHA256 178a731ee3435b451f1144bc4a63c9d70d4909a2c434e17c6e07db554df90bd6 SHA512 50db51358c9268cc5fdd0d48fb444be9e9356f1690bc1ae021a9618c8819ce8873bf4502fe87a10467ffda2ef38267ccca2af55152b064400c69a8da92b7e98b WHIRLPOOL 3c721753764d6f3adbf6090710aafdb29d78b3d55e718c0101d7cad993b51d7b335931c61f120f8dad4623fe16cad9f13952367934968599ed15dd9c744b9725
 DIST apcu-4.0.10.tgz 119264 SHA256 8dee6680924107d2aaf827f9cb8ef0e8e09c47bb38712a3439eddabe3ce41b40 SHA512 8aabd51996270cff98b9e329413f9cfcaa9be33a0df8bf9ad50ac2dfd320e348aee6432b8ecd498e077c490714184a82502ea656d825a5fcab70966780064163 WHIRLPOOL c39d4d0953dc4f5168032641c89292c2efcf514c2afca4f9cf65a35564c169021a0a74543556b6e890972904007c7c846a88d8c3ce2ccc0167a1a74e18779b99
 DIST apcu-4.0.8.tgz 119062 SHA256 bef4f5ae309526a332e0f6b98f0579a45d6000b928991babe684d4c22432d57d SHA512 990fbf3d6f490eeebf1d28eea5e7b0400c8c4badbfcf5ed1c5fc5b7186c5cd6d4ec87a99a8185e9bb27c64ccd371ca7b4324901f35a84644301e32fd9cfa8ef8 WHIRLPOOL 443f0f0a5a742933a19b22a18aa442587f3a7b75fc5e3739ea5dac9d8e31d9e40c41b8107b4d4953cb33f5baa49761a4d1c52a9f472377a5f7a4019750b08f64
+DIST apcu-5.1.2.tgz 108212 SHA256 ed51891990664fffa08417382fd5110d27937cc5715409043444b6bae472b764 SHA512 c237ecab9d24bca11dad55248dc3c96b7870681fcad571752d682e42eeca181e7033669df24d5bc99e232ffa8c77afb1fca6b2f4c2c86596f8b57f0eb9a1d581 WHIRLPOOL 48b85df9cd64404ab0ab345ef7f541bb67b3e67ff5514218ef9608f37f7c09ff5abf8ce6f28efb3a1e7fdb5ba05c285332906ab7826666167ff89f58436e5751
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.2.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.2.ebuild
new file mode 100644
index 000000000000..bfb52779b6ee
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="NOTICE README.md TECHNOTES.txt TODO"
+
+USE_PHP="php7-0"
+
+inherit php-ext-pecl-r2 confutils
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_configure() {
+	my_conf="--enable-apcu"
+	use mmap || my_conf+=" --disable-apcu-mmap"
+
+	enable_extension_enable "apcu-rwlocks" "lock_pthreadrw" 0
+
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r2_src_install
+
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu was"
+	elog "installed into ${PHP_EXT_SHARED_DIR}/."
+	elog
+	elog "If you depend on the apc_* functions,"
+	elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+	elog "provides backwards compatibility."
+}
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
new file mode 100644
index 000000000000..a8f7905880d6
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -0,0 +1 @@
+DIST apcu_bc-1.0.0.tgz 5893 SHA256 3e683aa5c284075e16bc2603849c11e8ed51d2c1da213b877f429b44af91500c SHA512 eb7946692a1f3aa11a23031226e0d99bc68eee92972a359ce27714ea35fcb2a225c8da09b860b891b7c291d57cbf1b858a05adfdb99731307b484b0096014e5c WHIRLPOOL 3cf77319f3086892836592d9c2e1fe5ae5dca7b95462ef2d60e4cb055872f3a30212e751f363901f0e1781c89c0ca222d9879970e787a06bb8c7bbc2b818c65b
diff --git a/games-emulation/gnomeboyadvance/metadata.xml b/dev-php/pecl-apcu_bc/metadata.xml
index d3c2cc926f0b..fd3dbe39fa64 100644
--- a/games-emulation/gnomeboyadvance/metadata.xml
+++ b/dev-php/pecl-apcu_bc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>php</herd>
 </pkgmetadata>
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.0.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.0.ebuild
new file mode 100644
index 000000000000..5c135d048eee
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="apc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README.md"
+
+USE_PHP="php7-0"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides APC backwards compatibility functions via APCu"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-php/pecl-apcu[php_targets_php7-0]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-openid/files/python-openid-2.2.5-tests.patch b/dev-python/python-openid/files/python-openid-2.2.5-tests.patch
new file mode 100644
index 000000000000..e5d17463ac95
--- /dev/null
+++ b/dev-python/python-openid/files/python-openid-2.2.5-tests.patch
@@ -0,0 +1,10 @@
+--- admin/runtests.orig	2016-01-01 03:32:55.835000000 +0000
++++ admin/runtests	2016-01-01 03:32:59.163000000 +0000
+@@ -93,7 +93,6 @@
+         'test_htmldiscover',
+         'test_nonce',
+         'test_openidyadis',
+-        'test_parsehtml',
+         'test_urinorm',
+         'test_yadis_discover',
+         'trustroot',
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 9c02942ad172..f2c426722181 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -30,6 +30,7 @@ python_prepare_all() {
 	local PATCHES=(
 		# Patch to fix confusion with localhost/127.0.0.1
 		"${FILESDIR}/${PN}-2.0.0-gentoo-test_fetchers.diff"
+		"${FILESDIR}"/"${P}-tests.patch"
 	)
 
 	# Disable broken tests from from examples/djopenid.
@@ -38,6 +39,8 @@ python_prepare_all() {
 		-e '/storetest/d' \
 		-i admin/runtests || die "sed admin/runtests failed"
 
+	rm -v openid/test/test_parsehtml.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 598b42cc1927..74025f8e7f2b 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1 +1,2 @@
 DIST mechanize-2.7.3.gem 133120 SHA256 3de7f3c2799be07b2788c8226e73cf9120a04ae79602c5bab2de6287e4575302 SHA512 5a06f1e7a1c97f985f3011358061c631bcc69e3092082959f738670c9491f734bc6dbbca321018fa484ee493f2f251b8af0cf17602fe381d491ff3e18663f2eb WHIRLPOOL 661869f23fd4f0a60a9a58ba35fd02cd51a65af79c66f8ab04d18498feb20f200d2959351ff44bcb4385f0c947e3b47e1b3e046735021d60d502256df8c63f98
+DIST mechanize-2.7.4.gem 137216 SHA256 1799d05733a1176a32179a210345a555b9a2bba4d1e2977f17fdcdf114aa6dd2 SHA512 d5d0dd824f3c2cee9111a55bff7323ed280cdb8f585169e71f35adcc2b9805b019867f916b425b9bfd655eaf2453ce405e6a303369dce7aff9e0bf4bd297f8c5 WHIRLPOOL 005dbe4be81b5cacd471c69867fa52919cff78b36259270269985553328ae4258fc829656cf093067c6a690beb4b88571f482351654ca41b1d4221f1ebb0bc75
diff --git a/dev-ruby/mechanize/mechanize-2.7.4.ebuild b/dev-ruby/mechanize/mechanize-2.7.4.ebuild
new file mode 100644
index 000000000000..dd53d8ef6f28
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.7.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
+	>=dev-ruby/net-http-digest_auth-1.1.1
+	>=dev-ruby/net-http-persistent-2.5.2
+	>=dev-ruby/ntlm-http-0.1.1
+	>=dev-ruby/webrobots-0.0.9
+	>=dev-ruby/http-cookie-1.0.2
+	>=dev-ruby/mime-types-2.0:2
+	>=dev-ruby/domain_name-0.5.1"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/* || die
+}
diff --git a/dev-ruby/metaclass/metaclass-0.0.4.ebuild b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
index 467dd258befe..96ff2700940b 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/games-emulation/gnomeboyadvance/Manifest b/games-emulation/gnomeboyadvance/Manifest
deleted file mode 100644
index 441d8fbcd784..000000000000
--- a/games-emulation/gnomeboyadvance/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnomeboyadvance-0.1.tar.bz2 32230 SHA256 04de90219a7b316fd9055a60c4e4b643ab2ae49f3c10d6c34dc3906d842aac94 SHA512 5c54c166251bf990a4ff834112c971e8c58fb2b094d495677239f316fffb6ddb0ea54def0fcff54a5474ec8e1ce772fe8aaaa4b2486c8cac5d77e36999186a1c WHIRLPOOL 3004e9c3eac81880b8af1c53a0ade3fe5b92737374a55d821b6c82d64978a60cabeea4cc90b7cef38752543c44b8326f82c0839848aa20786ee4927df97a2941
diff --git a/games-emulation/gnomeboyadvance/gnomeboyadvance-0.1.ebuild b/games-emulation/gnomeboyadvance/gnomeboyadvance-0.1.ebuild
deleted file mode 100644
index cb53ec6384a1..000000000000
--- a/games-emulation/gnomeboyadvance/gnomeboyadvance-0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2"
-inherit python games
-
-DESCRIPTION="A GNOME Python frontend to VisualBoyAdvance"
-HOMEPAGE="http://developer.berlios.de/projects/gnomeboyadvance/"
-#SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-python/libgnome-python
-	 dev-python/pygobject:2
-	 >=dev-python/pygtk-1.99:2
-	 games-emulation/visualboyadvance"
-
-S=${WORKDIR}/gnomeBoyAdvance-0.1
-
-pkg_setup() {
-	python_set_active_version 2
-	games_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:/usr/share/:/usr/share/games/:' \
-			gnomeboyadvance \
-			|| die "sed gnomeboyadvance failed"
-	python_convert_shebangs -r 2 ${PN}
-}
-
-src_install() {
-	dogamesbin gnomeboyadvance || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}"/gnomeboyadvance
-	doins gnomeBoyAdvance.png gnomeboyadvance.glade || die "doins failed"
-	dodoc README CHANGES TODO
-	prepgamesdirs
-}
diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index f907be223d80..f9c8f357e64b 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
+inherit cmake-utils wxwidgets flag-o-matic gnome2-utils fdo-mime games
 
 if [[ ${PV} == 9999 ]]; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
@@ -60,6 +60,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug #568792
+	append-cxxflags -std=c++11 -fpermissive
 	local mycmakeargs=(
 		$(cmake-utils_use_enable cairo CAIRO)
 		$(cmake-utils_use_enable ffmpeg FFMPEG)
diff --git a/header.txt b/header.txt
index 72ea74fe68bb..815fec895a62 100644
--- a/header.txt
+++ b/header.txt
@@ -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$
 
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild
new file mode 100644
index 000000000000..b6cc52c95a82
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.17"
+V_JPEG="8a"
+V_PNG="1.4.3"
+V_ZLIB="1.2.3"
+V_FT="2.3.12"
+
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
+RESTRICT="test"
+IUSE="hardened +png +truetype gpm fbcondecor"
+
+DESCRIPTION="Framebuffer splash utilities"
+HOMEPAGE="http://sourceforge.net/projects/fbsplash.berlios/"
+SRC_URI="
+	mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2
+	mirror://sourceforge/fbsplash.berlios/${GENTOOSPLASH}.tar.bz2
+	mirror://gentoo/${MISCSPLASH}.tar.bz2
+	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
+	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
+	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
+	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	gpm? ( sys-libs/gpm[static-libs(+)] )
+	truetype? (
+		>=media-libs/freetype-2[static-libs]
+		app-arch/bzip2[static-libs(+)]
+		sys-libs/zlib[static-libs(+)]
+	)
+	png? (
+		>=media-libs/libpng-1.4.3[static-libs]
+		sys-libs/zlib[static-libs(+)]
+	)
+	virtual/jpeg:0[static-libs]
+	app-arch/cpio
+	media-gfx/fbgrab
+	!sys-apps/lcdsplash
+	sys-apps/openrc"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+SG="${WORKDIR}/${GENTOOSPLASH}"
+SM="${WORKDIR}/${MISCSPLASH}"
+
+pkg_setup() {
+	if use hardened; then
+		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
+		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
+		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
+		ewarn "the splash kernel helper."
+	fi
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
+
+	# We need to delete the Makefile and let it be rebuilt when splashutils
+	# is being configured. Either that, or we end up with a segfaulting kernel
+	# helper.
+	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
+
+	cd "${SG}"
+	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
+	epatch "${FILESDIR}/splashutils-1.5.4.4-sys-queue.patch"
+
+	if use truetype ; then
+		cd "${SM}"
+		epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}/splashutils-1.5.4.4-ft25.patch"
+	fi
+
+	cd "${S}"
+	ln -sf "${S}/src" "${WORKDIR}/core"
+
+	#epatch "${FILESDIR}/${P}-bzip2.patch"
+	epatch "${FILESDIR}/${P}-multi-keyboard.patch"
+	# Bug #557126
+	epatch "${FILESDIR}/${P}-no-la.patch"
+
+	if ! tc-is-cross-compiler && \
+	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
+		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
+		ewarn "splashutils, you're on your own, as this configuration is not supported."
+	else
+		# This should make splashutils compile on systems with hardened GCC.
+		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
+	fi
+
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
+	fi
+
+	# Latest version of klibc defined its own version of ferror, so there is
+	# not need for the hack in klibc_compat.h
+	if has_version ">=dev-libs/klibc-1.5.20"; then
+		echo > "libs/klibc_compat.h"
+	fi
+
+	rm -f m4/*
+	epatch_user
+	export PKG_CONFIG="pkg-config --static"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${SM}"
+	emake CC="${CC}" LIB=$(get_libdir) STRIP=true
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		--without-mng \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttf-kernel) \
+		$(use_enable fbcondecor) \
+		--docdir=/usr/share/doc/${PF} \
+		--with-freetype2-src=${FT2SRC} \
+		--with-jpeg-src=${JPEGSRC} \
+		--with-lpng-src=${LPNGSRC} \
+		--with-zlib-src=${ZLIBSRC} \
+		--with-essential-libdir=/$(get_libdir)
+}
+
+src_compile() {
+	emake CC="${CC}" STRIP="true"
+
+	cd "${SG}"
+	emake LIB=$(get_libdir)
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	cd "${SM}"
+	emake DESTDIR="${D}" LIB=${LIB} install
+
+	cd "${S}"
+	emake DESTDIR="${D}" STRIP="true" install
+
+	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
+	gen_usr_ldscript libfbsplash.so
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	if use fbcondecor ; then
+		newinitd "${SG}"/init-fbcondecor fbcondecor
+		newconfd "${SG}"/fbcondecor.conf fbcondecor
+	fi
+	newconfd "${SG}"/splash.conf splash
+
+	insinto /usr/share/${PN}
+	doins "${SG}"/initrd.splash
+
+	insinto /etc/splash
+	doins "${SM}"/fbtruetype/luxisri.ttf
+
+	cd "${SG}"
+	make DESTDIR="${D}" LIB=${LIB} install
+	prune_libtool_files
+
+	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
+	keepdir /${LIB}/splash/{tmp,cache,bin,sys}
+	dosym /${LIB}/splash/bin/fbres /sbin/fbres
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
+pkg_postinst() {
+	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
+		elog "This package has been designed with udev in mind. Other solutions, such as"
+		elog "devfs or a static /dev tree might work, but are generally discouraged and"
+		elog "not supported. If you decide to switch to udev, you might want to have a"
+		elog "look at 'The Gentoo udev Guide', which can be found at"
+		elog "  https://wiki.gentoo.org/wiki/Udev"
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
+		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
+		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
+		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
+		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
+		elog "to use fbcondecor, run:"
+		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
+		elog "and re-emerge splashutils."
+	fi
+
+	if ! test -f /proc/cmdline ||
+		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
+		elog "It is required that you add 'console=tty1' to your kernel"
+		elog "command line parameters."
+		elog ""
+		elog "After these modifications, the relevant part of the kernel command"
+		elog "line might look like:"
+		elog "  splash=silent,fadein,theme:emergence console=tty1"
+		elog ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+		elog "core splashutils package. To get some themes you might want to emerge:"
+		elog "  media-gfx/splash-themes-livecd"
+		elog "  media-gfx/splash-themes-gentoo"
+	fi
+}
diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild
index 6320424e2c32..93bc4fef317b 100644
--- a/media-video/aegisub/aegisub-3.0.4.ebuild
+++ b/media-video/aegisub/aegisub-3.0.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$
 
@@ -57,6 +57,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-lua-macro.patch"
+	"${FILESDIR}/${P}-fix-install-with-empty-LINGUAS.patch"
 	"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
 )
 
diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
new file mode 100644
index 000000000000..59927d30a7fd
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
@@ -0,0 +1,23 @@
+Upstream always installs all available localization files. We workaround it by
+sed'ing out unneeded languages from PO variable in aegisub/po/Makefile file.
+This can lead to an empty PO definition and in this case install target fails.
+Thus a simple guard is introduced to prevent this fail.
+
+diff --git a/aegisub/po/Makefile b/aegisub/po/Makefile
+index 0b73bde..957c123 100644
+--- a/aegisub/po/Makefile
++++ b/aegisub/po/Makefile
+@@ -38,11 +38,13 @@ all: $(MO)
+ 	$(BIN_MSGFMT) -o $@ $<
+ 
+ install:
++ifdef PO
+ 	@$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(DESTDIR)$(P_LOCALE)/, $(basename $(PO))))
+ 	@for i in $(basename $(PO)); do \
+ 		echo $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
+ 		$(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
+ 	done
++endif
+ 
+ 
+ CLEANFILES = $(MO)
diff --git a/profiles/package.mask b/profiles/package.mask
index 208a52bcde55..1084db6782e2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -250,12 +250,6 @@ dev-php/pecl-zendopcache
 dev-lang/php:5.4
 ~virtual/httpd-php-5.4
 
-# Michael Sterrett <mr_bones_@gentoo.org> (01 Dec 2015)
-# No release since 2005; upstream is gone; doesn't build
-# on modern systems.
-# Masked for removal on 20151231
-games-emulation/gnomeboyadvance
-
 # Justin Lecher <jlec@gentoo.org> (12 Nov 2015)
 # deprecated version of the plugin. 
 # sci-chemistry/pymol includes the newer version