make build output verbose, fix build wrt #432178, fix desktop file wrt #432222

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 66 insertions, 10 deletions

diff --git a/games-engines/gargoyle/ChangeLog b/games-engines/gargoyle/ChangeLog
index 68d0da3d7999..2311a833f470 100644
--- a/games-engines/gargoyle/ChangeLog
+++ b/games-engines/gargoyle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-engines/gargoyle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.18 2012/06/15 15:40:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.19 2012/08/21 19:18:49 hasufell Exp $
+
+  21 Aug 2012; Julian Ospald <hasufell@gentoo.org> gargoyle-2011.1.ebuild,
+  +files/gargoyle-2011.1-desktopfile.patch:
+  make build output verbose, fix build wrt #432178, fix desktop file wrt
+  #432222
 
   15 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> gargoyle-2011.1.ebuild:
   games goes last on inherit line
diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index 537423b9d601..9962007b84ac 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,6 +1,21 @@
-DIST gargoyle-2010.1-sources.zip 10771623 RMD160 68407ca19b4c3a4efc40c18a363e5e3dc15e950f SHA1 eeea17b34ba7cdeb0dc1b619b88b36ec2bb8368f SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d
-DIST gargoyle-2011.1-sources.zip 11291660 RMD160 43de562c12a068c5d6f4fab6bb62647faadd0ff3 SHA1 8e01e458e01dd7d20fe5330f95a3e44b7cbc37d6 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634
-EBUILD gargoyle-2010.1.ebuild 3253 RMD160 efc7f7579d42f2dc89144e6a559bb4e45a286433 SHA1 090d04e500ce4aa581d4904440cf2fa13e26b70f SHA256 8fdd51a82daf4243e5bac795f7f0c8e3cf5b0c1a52b8cf0f5f1f8284e6a3fee6
-EBUILD gargoyle-2011.1.ebuild 2747 RMD160 2af45f4af56d3dbf0bfd3706989ca982461ee4f0 SHA1 441fe1c37c4b58cf19ed4e6ba813c6e8df461a9d SHA256 57ed2d76a42ad4f506ba49e1a47c5a90c8ee00ce991defbae1aa8f0ce92ec055
-MISC ChangeLog 3140 RMD160 3c0e3cf3572ea95cd237f0454fedb3f7a9e5c2a6 SHA1 5d9673284d1f38e1846c6ef23d55d3fb71161cd0 SHA256 c9ab962b6b372df004bf624da772bfe2ed06a2307bc8681d4e36dd4e35e36394
-MISC metadata.xml 331 RMD160 d6a967accb25d826d8cff9ef9ba8cc7cfac40e2b SHA1 e6453420924637fed38cb2ebcbdc320815329343 SHA256 51cc1262568afa65da7057a6ff1799d5e09251f97eb7d15c4708b8140aa5993d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gargoyle-2011.1-desktopfile.patch 1265 SHA256 b9f0eba5af34a7703c2d3bd38e216f82fd86cbf1acdb94267aaa06ba8b9a222f SHA512 ed31bc711b52b5d231f130956d7d07cb9080747e6d53c85b379aa413582f8e4ffe825298bc86180ec7d1eadff5e6bffc6e49b3ff7a2607f612dcf81a6c1af22e WHIRLPOOL b80e185d019ae88e256c14700c510a1ca81a9d7dbd081c9b685c7e5149d743d53d0a54606f295e8e35a074ba46753ea3ac1fe9fa10dd995910a872fa6d48b5fc
+DIST gargoyle-2010.1-sources.zip 10771623 SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d SHA512 45a24eae5b02864e8e0df2833ff53cc8aad28aed8e404bb6dd95caa48c9522989196b60b9d70702af4d5e0f7bc06af48e8067dc0580fd23d8612513305b72079 WHIRLPOOL 5cc4e2018c58b1080c5338981ea3543b45adc8bff6b7e3e6546387ad29c63dec978eddd048ccd484628645d274394ca3735c1bb1c617e691dd05787c0cb7b248
+DIST gargoyle-2011.1-sources.zip 11291660 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634 SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f WHIRLPOOL 19e572d52ec6436c5b41d767e45d509bd965a0d4009b4445db08e79125eabb20636374bbb818ef7115a1ca9ac983a29cb2eaa3848a22e17d5e7d26284200b86f
+EBUILD gargoyle-2010.1.ebuild 3253 SHA256 8fdd51a82daf4243e5bac795f7f0c8e3cf5b0c1a52b8cf0f5f1f8284e6a3fee6 SHA512 3edd73646cd9a33bdc919a3bc3cef6e1fae814955cc8c9d9618582f3a4e7edabd56907d7e42b5c934a1fbdd9981516add5ca2046eb5de5caffed39ed3910bc5f WHIRLPOOL 7e23dfa4cd8d7b305a4f144c500c2814d9ec100893dabb19d6f7074dfbdfe7ea570022fead48f12330ec9d6708281e2246d272c1f01da487f16638624f343cd6
+EBUILD gargoyle-2011.1.ebuild 2862 SHA256 cc4f1996920b2cdeb2a76fe7ad67b1122fbaf885a2f59d44bc807858cef84a2b SHA512 9e37153053f6678aaefd1ee837599ee5297c0b3b450da82eeda294dd9eb20abc5d1b56f5abf8848c30d83b06eba28d5e1154a9b61c839d48bc77db11ce56594e WHIRLPOOL acf6a7c0840af8cef36a8f1208d205da1de10a8f960217cf765408eba85545d51e3e9b2a4473212ed5d71db6f03a198eb9c94602da5d1cf60edff04902d6e698
+MISC ChangeLog 3342 SHA256 221298364f475a3488cc2c4cda586bbb221246d37b99f82dc78e418a3b456046 SHA512 ddaf41baebfa62cf2ceb77bf016087fe2f73568b1c592745be2d3527400c2eb44293ae8448c84d926e34bb378d904cdf94cc27c86d73b31e58804acbc62cb509 WHIRLPOOL a5d44db0329a78958e0c3742f95aa66576234815e8f7609ad3c9cad2a92623c2ad53e9a1e61d26ab533f713b62f4e9cd1783f9b4ae8ccb214b382848abeccbfe
+MISC metadata.xml 331 SHA256 51cc1262568afa65da7057a6ff1799d5e09251f97eb7d15c4708b8140aa5993d SHA512 d7dd2d4155c4c41730c9e03d51239c275458d82e0ca3448aa54078937cbaef3256f599ef47fb5ee50c6f2cb3734270de9dc0face1e7444bd7c67a459ce4c41f1 WHIRLPOOL 0c2e76db27725d24fd24685f56305949a1fef04f87c5e0db8ebe5bd88e16a73b4d16b9109d3237a1968f466d36d3bc7660e03cecc2f9f8d479e4138ed38ee8f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQM93vAAoJEFpvPKfnPDWzc3MIAKqzWbAVJyYtjFgCslYYJa5K
+fVLETvGMIyGzTUX5hxw6bXEyPvOdxw1Gz0CMPvXovQS+eGtdXx1UvF9qC0h+R29g
+wggoF+YPBRLkWCz4vo0Rww/LKYws+QlYI0uCuS8yhVYJWBNybYdQ41xi6zDqpbWf
+eBgeZ6Z13Ul/iN/fHbL+Uv7Bnfv6nvnQq8vNJklkuq0uJd4P3QtiX9Cv7+uNURCp
+iI24uMNqxe65BW/CeEn8wwn6RKmQhkyNw4w9I+VYDNw3JhjDpSYGj93mJ6vWvR5N
+5eW26DL26cvlXKS4qsx65L4O8IiJBq+BX9uFK/NWyUR5eEhE98PcUS00BTbFX/8=
+=dOcX
+-----END PGP SIGNATURE-----
diff --git a/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch b/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
new file mode 100644
index 000000000000..6b66328da016
--- /dev/null
+++ b/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
@@ -0,0 +1,31 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Aug 21 19:06:54 UTC 2012
+Subject: desktop file
+
+fix QA issues:
+
+# desktop-file-validate /usr/share/applications/gargoyle.desktop
+/usr/share/applications/gargoyle.desktop: error: file contains at least one line ending with a carriage return, while lines should only be separated by a line feed character. First such line is: "[Desktop Entry]"
+/usr/share/applications/gargoyle.desktop: error: (will be fatal in the future): value "gargoyle-house.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
+
+--- garglk/gargoyle.desktop
++++ garglk/gargoyle.desktop
+@@ -1,9 +1,9 @@
+-[Desktop Entry]

+-Version=1.0

+-Type=Application

+-Name=Gargoyle

+-GenericName=Interactive Fiction interpreter

+-Comment=Interactive Fiction multi-interpreter that supports all major IF formats

+-Icon=gargoyle-house.png

+-Exec=gargoyle

+-Categories=Game;

++[Desktop Entry]
++Version=1.0
++Type=Application
++Name=Gargoyle
++GenericName=Interactive Fiction interpreter
++Comment=Interactive Fiction multi-interpreter that supports all major IF formats
++Icon=gargoyle-house
++Exec=gargoyle
++Categories=Game;
diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1.ebuild
index 5fa453eaf751..2255b3c62325 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.3 2012/06/15 15:40:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.4 2012/08/21 19:18:49 hasufell Exp $
 
 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
 # interpreters are licensed under GPLv2, BSD or MIT license, except:
@@ -10,7 +10,7 @@
 # don't apply. (Fonts are installed through dependencies instead.)
 
 EAPI=3
-inherit eutils multiprocessing games
+inherit eutils multiprocessing toolchain-funcs games
 
 DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
@@ -33,7 +33,8 @@ RDEPEND="media-libs/freetype:2
 
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	dev-util/ftjam"
+	dev-util/ftjam
+	virtual/pkgconfig"
 
 src_prepare() {
 	# Substitute custom CFLAGS/LDFLAGS.
@@ -52,13 +53,17 @@ src_prepare() {
 
 	# The font name of Linux Libertine changed in version 5.
 	sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini
+
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
 }
 
 src_compile() {
 	jam \
+		-sAR="$(tc-getAR) cru" \
 		-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \
 		-sUSESDL=yes \
 		-sBUNDLEFONTS=no \
+		-dx \
 		-j$(makeopts_jobs) || die
 }