Revision bump to -r2 with EAPI=4 to use USE deps defaults; add a use dep on static-libs for sys-libs/gpm as well.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 258 insertions, 6 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 0e1da0580d26..99d469b385c2 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.203 2012/10/21 08:58:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.204 2012/10/26 20:29:03 flameeyes Exp $
+
+*splashutils-1.5.4.4-r2 (26 Oct 2012)
+
+  26 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +splashutils-1.5.4.4-r2.ebuild:
+  Revision bump to -r2 with EAPI=4 to use USE deps defaults; add a use dep on
+  static-libs for sys-libs/gpm as well.
 
   21 Oct 2012; Markus Meier <maekke@gentoo.org> splashutils-1.5.4.4-r1.ebuild:
   x86 stable, bug #422921
@@ -1001,4 +1008,3 @@
   21 Aug 2004; Michal Januszewski <spock@gentoo.org> +metadata.xml,
   +splashutils-0.9_pre07.ebuild:
   Intial commit.
-
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 028492cce35b..f85f6eada343 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -29,13 +29,18 @@ DIST splashutils-lite-1.5.4.4.tar.bz2 441340 SHA256 bc0e22293d4550281d2289672da3
 DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4
 EBUILD splashutils-1.5.4.3-r3.ebuild 8408 SHA256 7e4f26ce0cbc681135d0fade2659a1e6ef5cc6f6c6bc601accd9587edec68a76 SHA512 6ed511aa03d752346645fbcb6142360b09a84f912ac62496d9ceeb80a23b6ebca8649da88356e84e8b18b63ab5504fcf76c5023faa9ba1b0f32845d9f2b4248d WHIRLPOOL ff9172f05acad4e2748a2a93b8b62d538e5ab9f9329ad308abcb683e258159034478bc7a07665fc6093005715834b36b43b8293125da96e2158977fc87bedcb7
 EBUILD splashutils-1.5.4.4-r1.ebuild 7612 SHA256 70920c3b14751a40c830dbabc8f97762478bae6b573812d3804ff0272809b0a3 SHA512 737bd807ed828c2d626a05196ded72fc9b19be8b4f43478640a91c2ff455da57a1d4af1eb40a9b8395d3f53c50d2e13b066d03dd69447ab994c63da261d6df3a WHIRLPOOL dbbcadbc9ead2311f33cc2d0e35b8f9bd9effc1b102189c0ddf6de517d46c57732e0d93153ca4d5965dbb2174ad8914a8fc3e5403a9d6d6c099e3aa749d2bea9
+EBUILD splashutils-1.5.4.4-r2.ebuild 7319 SHA256 46a31670287748b2c4f99777025f37b1f98a3e17e7e36b6691008458aa82020f SHA512 3b2fd5f172da44bbf32be20518ff2802e2ab53a9c75936ce2db00fffc1cd6f3f836e9825515ea0c1c39a2fcb0abda0246f914ce0eabca54da9ac82c06c549f85 WHIRLPOOL ef8c2867ca6f10b2acd2cb99979eda0a5d5999fa9b6dbd88a5d927e6ef0505edd9942023361f7d2792fe8fec96a82e1cbe6e5b8b95965c499ae803253bc89577
 EBUILD splashutils-1.5.4.4.ebuild 7567 SHA256 172e7b2cd261d50976a6678c9858010ca9ff981d6874f054dcc0a9a9a0a15412 SHA512 38a0f7a241131430de834e0d8d7398229b392b3464109f4d4ceca41927affc2683b30bbbc1841fbba6790d208e4198f12c248a86bcc9045b0ddcdc1d9db38b51 WHIRLPOOL 27dff20526cf32e85296d365047b800962b77c3fff83548629689e3351bf3300d07cf450967f193f811a681499a50c2501f30e19d8d6781d1c60d734405443ce
-MISC ChangeLog 36145 SHA256 202ee6b71e498bbdf5b9c744e7c4eb078feb22c7d061cec37ee6dda12162e2a6 SHA512 247ab5cdae0a0df457b106c18096c99be7d0d63f488a4e27ab018c07bdaf9bd89be70369a453ccbea0397102a6493e405477b7c1ed2215b0b8622b7d498571cb WHIRLPOOL 962a23306193a63d4d59ca08c24d75e45dd8377a43e74e87e8cb3efd03e03d78524221f71332f67356db0a7a7290eb2e02e8e7a1734d7541593fd6f4dcc3cb9b
+MISC ChangeLog 36395 SHA256 312a2e473d248ccad5f4f4fd74c70cd76d030fa107c5c7a2fdf536823de49367 SHA512 d9501402cc6cae01c8d0b5bc7383ba05be6623123a6d856e291eef92907453f1595cc0eca6e214404a43e977d01d17e3db1f307c5fd63c76796156cf295db81c WHIRLPOOL 5db220ebd5349ae2c08ee26d7f17060b954f91582180eb233a4ab240f87a72fd4616c05601be24294ee652afb140c5926effcaab9b087fe6aefbca34b8bdb283
 MISC metadata.xml 290 SHA256 8cafd30cdb9d1d0db9dbf9780adaec8c687052bc8759d4b61c637c24d6e0bee7 SHA512 f83b143903b051d232f2bebc622e7525c8d740cd9f0b4dfd68e611ab091341776574b4a913859253841f6eb603e5a4456fbb2706bc9996c4499ab08bc480294f WHIRLPOOL 8806c60d15ecfdec99c12efddb9cf3236cb80db1994406fac31ea53ac0e6ceaa25d9983d66cabb6811356f52ceec10264c9024afb6a4cb7835bcabc8ade8d8dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCDuhoACgkQkKaRLQcq0GL66wCglG+M63SJ/odfcsczHsuPb0rC
-riMAn12/+7eT6y+L2XgnRsyAtzlevEX/
-=LeCZ
+iQEcBAEBCAAGBQJQivNbAAoJEBzRPIrUMBNC+9gH/jrwLMD48eA5LYvpxtd8DPfT
+YfeD6e2O43g5Py7vVrvlEpVo/ukViI/7D7i6e2vSzyAstAkyKe9kK8RsaVHRkklT
+Ktne3t8A+8cG1VKS6+2hTAWXD95th/DgwAXm705hlHOhWhwhAwLGwjKSUOSRpaq5
+o5X7Iz7PO3zSH+Lr1IpfromQZf+KAnMpP98GWhNE0Q1fc02T7jvJZFYaB/BZUlU8
+g9X04KEzqz8xxGvRLSNwTYchY7Ot9suTk7BEI3T4EtIZRcJcidsEnXBRg8i3H8qG
+RM7fdVworEe+SKl9F3AL8DcdEn/2DfdBi1zZA3/m/S16JOFBGGdYA3frfDPZs7o=
+=i+N+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild
new file mode 100644
index 000000000000..e6d97e4ae4ed
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild,v 1.1 2012/10/26 20:29:03 flameeyes Exp $
+
+EAPI=4
+
+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 +mng gpm fbcondecor"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://fbsplash.berlios.de"
+SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
+	mirror://berlios/fbsplash/${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="~amd64 ~ppc ~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] )
+	mng? (
+		media-libs/lcms:0[static-libs]
+		media-libs/libmng[static-libs(+)]
+	)
+	virtual/jpeg[static-libs]
+	>=sys-apps/baselayout-1.9.4-r5
+	app-arch/cpio
+	media-gfx/fbgrab
+	!sys-apps/lcdsplash"
+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"
+
+	if use truetype ; then
+		cd "${SM}"
+		epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
+	fi
+
+	cd "${S}"
+	ln -sf "${S}/src" "${WORKDIR}/core"
+
+	epatch "${FILESDIR}/${P}-bzip2.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/*
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${SM}"
+	emake CC="${CC}" LIB=$(get_libdir) STRIP=true
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		$(use_with 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"
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		emake LIB=$(get_libdir)
+	fi
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	cd "${SM}"
+	make DESTDIR="${D}" LIB=${LIB} install
+
+	cd "${S}"
+	make 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
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		make DESTDIR="${D}" LIB=${LIB} install
+	else
+		cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
+	fi
+
+	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 sys-fs/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 "  http://www.gentoo.org/doc/en/udev-guide.xml"
+		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
+
+	elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
+	elog "'fbcondecor'.  Accordingly, the old 'splash' initscript is now called"
+	elog "'fbcondecor'.  Make sure you update your system.  See:"
+	elog "    http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
+	elog "for further info about the name changes."
+	elog ""
+	elog "Also note that splash_util has now been split into splash_util, fbsplashd"
+	elog "and fbcondecor_ctl."
+}