add log message about CONFIG_UID16 (bug #340303); tidy

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

3 files changed, 22 insertions, 39 deletions

diff --git a/games-strategy/smac/ChangeLog b/games-strategy/smac/ChangeLog
index 8e4bd0a6aab2..278152837d98 100644
--- a/games-strategy/smac/ChangeLog
+++ b/games-strategy/smac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/smac
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.18 2012/02/05 06:25:05 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.19 2013/01/31 20:04:47 mr_bones_ Exp $
+
+  31 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> smac-6.0a.ebuild:
+  add log message about CONFIG_UID16 (bug #340303); tidy
 
   05 Feb 2012; Mike Frysinger <vapier@gentoo.org> smac-6.0a.ebuild:
   Move to new unpacker eclass for unpack_makeself.
@@ -60,4 +63,3 @@
   +smac-6.0a.ebuild:
   Initial import. Ebuild by <anakin.skyw@gmx.de> and submitted to bug #98687.
   Closing bug #98687 and bug #31395.
-
diff --git a/games-strategy/smac/Manifest b/games-strategy/smac/Manifest
index 052d0cbc66b9..957b06deb1f7 100644
--- a/games-strategy/smac/Manifest
+++ b/games-strategy/smac/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST smac-6.0a-x86.run 6801730 RMD160 323e1958a9a48b7ce6c76ce07da9718fc1b796d9 SHA1 2cc8a3112c28c72548b9fa485cd28fa7ba6126a3 SHA256 69b845728f55caef038c6392f148beae47156933f5bff0ce7d9c49162f1d0ee7
-DIST smac-install-ppc.run 18528928 RMD160 3b4a9edbf55499c998283ca84e9d95cb80e1b4e9 SHA1 d876d9854a446c34a8da9b4044a64d0ca44dd9b2 SHA256 ad90f6fa4fa3bfe39f5474016ea6a0c738687fc038995bcd7675294c0438477c
-EBUILD smac-6.0a.ebuild 3203 RMD160 e18454ecdefa350ec1d2ee41306a14a1ced802c8 SHA1 1343d15573d74cde17769d9c6093d41f80bd903a SHA256 0ed3016127d4396e9aa6dd0e711acb1d81472ea430445554a5e0847f5a79a8ab
-MISC ChangeLog 2512 RMD160 a2e0e0cd4ab441a53679233d538d8aae7b58c2b6 SHA1 ac8aa83619def82fc6385b80079c2d5c0919e311 SHA256 e2698d1b4676eaff828860e57efff941108d4d529cbb0543dfde3a5ba80c6736
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPLiDaAAoJELEHsLL7fEFWh88P/ispkbOgb2N937BQB3A5+Eqb
-h+HIuSBRWfTnbBTL0+uXdxJ7upUgMUcj/Drk04+aRKBXepg6rJrK3YgwI+cYyZ7p
-6+ykrBOG3DhGh7dRhF5VnrGQwznSM4IR0G6Cp0buMCGhMY4jo8+o2acYJw8V+DhW
-GvIeG9rD51uSFxLBXXwlI84Lz1yl1hbMZglL6rCzhcmFffRgavvVWouuPu8i97g2
-65aOfB1PKapDYiRnOuHL2npdZ2iMy4eo2zE4PLNJI8dh1/72j596KLxN7TLkKJih
-3/BVGiM+IMbK3ER9/6zd0vh2+4BntQaGfpJ/xbFxi5k4qiEQ2ouk8BLLmP+KOxnQ
-OtIDgeDMCr6uKheZlq8LgG9JqxYWwZq3eMptQceZq0IQ0lnvtZmkaKaMABGt46Fl
-SfzeJ4dhgzkHjwWs/OusGYl5YBOk+DdHtQ6I9Eaeq1I3dGr3c9qSrNhmmXAZn6+5
-X+4HQwp4hqZjq4yLgz0C+K/B/N1ZgaWYt50CY3gJ/fmftgR3XA6X3+1X95vPPzQc
-iV9NuXJiMznBQe8uq+WzWsSIUUpy2ZMYfJcV8XgUEbp8099TdI1WCxkMiVedQ7q2
-i4BZkbQgtQ0LtrFxOf4e4cq+UrPEYWJdTMvREOsjuhuY+NKEkB6YlcHJ+Qe36277
-HMk7q5Zzea42xxvBbzxB
-=snv7
------END PGP SIGNATURE-----
+DIST smac-6.0a-x86.run 6801730 SHA256 69b845728f55caef038c6392f148beae47156933f5bff0ce7d9c49162f1d0ee7
+DIST smac-install-ppc.run 18528928 SHA256 ad90f6fa4fa3bfe39f5474016ea6a0c738687fc038995bcd7675294c0438477c
+EBUILD smac-6.0a.ebuild 3224 SHA256 51c9eead4a05536e2f23f9c87afff83b51e2c5ae3c2954791bf0ede26f1b07e9 SHA512 e8dabaea3650057d219125a5a21b185b3a83edf18ad6a7faf967ad8dbaff0bf98818f29a663a1035ded84159b4c504b96426e91cf2e2e61c7f54aeda52bf49c2 WHIRLPOOL a3c1dfe411a96e1f1af4a8447b338feb094a8cbb6968511bb9363c0b09a00555d12cffb203c8e43d71ec847592ef11f11f9f41bd682f3dcd495192c2901fa079
+MISC ChangeLog 2645 SHA256 66783a26ebeb5af4a7512d15a2d9f79d768a8017c53c89cddb0f581b9fbb4514 SHA512 bd9f9bfb1e22e23904aeec18ab9ce30254d832750aa3d996faa45adf1019c15c9f1d792d0c601972e1749710a10301ad92ef411caa902fb017f502770e9dd827 WHIRLPOOL ed1f6346eca1b0d1107ed09ca5b08175d2595294e0ec7ad68cae34b107b282a0dd899d8a67b91a6faaf1fabae8214040895022df7f1379af154410f65e2d6764
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
index fd296448d7b9..d145c5cf2bb6 100644
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ b/games-strategy/smac/smac-6.0a.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/games-strategy/smac/smac-6.0a.ebuild,v 1.22 2012/02/05 06:25:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.23 2013/01/31 20:04:47 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils unpacker cdrom games
@@ -24,7 +24,7 @@ RDEPEND="sys-libs/glibc
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	!ppc? ( sys-libs/lib-compat-loki )
-	media-libs/libsdl
+	media-libs/libsdl[audio,video]
 	media-libs/sdl-ttf
 	media-libs/sdl-mixer
 	media-libs/smpeg
@@ -45,20 +45,19 @@ src_unpack() {
 src_install() {
 	einfo "Copying files... this may take a while..."
 	exeinto "${dir}"
-	doexe "${CDROM_ROOT}"/bin/x86/{smac,smacx,smacpack} || die "doexe failed"
+	doexe "${CDROM_ROOT}"/bin/x86/{smac,smacx,smacpack} || die
 
 	insinto "${dir}"
 	doins ${CDROM_ROOT}/{{Alien_Crossfire,Alpha_Centauri}_Manual.pdf,QuickStart.txt,README,icon.{bmp,xpm}}
 
 	cd "${Ddir}"
-	tar xzf "${CDROM_ROOT}"/data.tar.gz || die "unpack"
+	tar xzf "${CDROM_ROOT}"/data.tar.gz || die
 	insinto "${dir}"/data
-	doins "${CDROM_ROOT}"/data/*.{pcx,cvr,flc,gif} || die "copying data"
-	doins -r "${CDROM_ROOT}"/data/{facs,fx,projs,techs,voices} \
-		|| die "doins failed"
+	doins "${CDROM_ROOT}"/data/*.{pcx,cvr,flc,gif} || die
+	doins -r "${CDROM_ROOT}"/data/{facs,fx,projs,techs,voices} || die
 
 	if use videos ; then
-		doins -r "${CDROM_ROOT}"/data/movies || die "copying movies"
+		doins -r "${CDROM_ROOT}"/data/movies || die
 	fi
 
 	cd "${S}"/a
@@ -66,7 +65,7 @@ src_install() {
 		cd ${P}-ppc
 	fi
 	loki_patch --verify patch.dat
-	loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching"
+	loki_patch patch.dat "${Ddir}" >& /dev/null || die
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
@@ -87,7 +86,7 @@ src_install() {
 	    einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
 	    dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 && \
 	    dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 && \
-	    dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2 || die "dosym failed"
+	    dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2 || die
 	fi
 }
 
@@ -99,4 +98,6 @@ pkg_postinst() {
 	elog " smac"
 	elog "To play Alien Crossfire run:"
 	elog " smacx"
+	elog "Be sure to enable CONFIG_UID16 in your kernel config or"
+	elog "the game will error." # bug 340303
 }