fix underlinking (bug #515318); clean old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

5 files changed, 12 insertions, 117 deletions

diff --git a/games-kids/gmult/ChangeLog b/games-kids/gmult/ChangeLog
index dfc2b7917be7..b5a0a10d0a68 100644
--- a/games-kids/gmult/ChangeLog
+++ b/games-kids/gmult/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/gmult
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/ChangeLog,v 1.18 2013/12/24 12:43:40 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/ChangeLog,v 1.19 2014/06/27 05:53:15 mr_bones_ Exp $
+
+  27 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/gmult-5.3-gcc43.patch, -gmult-5.3.ebuild, gmult-8.0.ebuild:
+  fix underlinking (bug #515318); clean old
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> gmult-8.0.ebuild:
   Stable for x86, wrt bug #491062
diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest
index bb6c5380eab8..3caea17f5443 100644
--- a/games-kids/gmult/Manifest
+++ b/games-kids/gmult/Manifest
@@ -1,27 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX gmult-5.3-gcc43.patch 763 SHA256 8d1db7bbb51ef63809c111e69dab04e13e719fd5fb9f070323088c98132c1059 SHA512 1402f2230465e01f7d4f992f93870b72124f231ae4bf409cba0aa94ece9d196c23d8985b279c4c4847c7970c83df0d23751c34bb1474541f65415bc5d99e48a6 WHIRLPOOL 53f10f3d4764ae7ed71cab46fefac1e30d6e6d3e9b879e9d6493ddf0dce596c3c1205fc7fc0dd758a13eb80cff5258615139a7f12f069e80dff1ac4f0f8ec0a9
-DIST gmult-5.3.tar.bz2 142440 SHA256 dc983113c27ebf29fccec8330f15d6d3d9786eb5f4d68706fc94832ca5331f5a SHA512 bb82e9b4a6baff7dc23e9e134d23b384525d22e9203b9522e373b63dd9444eb6683c98f9d2a7039555ac6026a8472f13155ee81b283eddea98b398e9e000ed3d WHIRLPOOL 0c12c18ae92f0ca6fdf51134f4620861ddd4aa0afd258fdb0082808ec6554936eba98dfe21a81d93d0d424803e2bf206873cce7ad45135ece7dfd82daae2f3d9
 DIST gmult-8.0.tar.bz2 222981 SHA256 d4ed9282ea160b292e8c842ef761b56d3dafa2e0b229d0ee6b742cabc5a499d6 SHA512 40c29a998d50491de8c14f7e71ad298fb69e0dc6f1f04b1f9bf35f9f72010eb085a9bc7a9efa1f3c339ea44fdeb9eec4d4f82017442c57ebc28f992bc703252f WHIRLPOOL f7c1dcde25bb4fb1aa990f2c0415c88e9c987523128f1a6377b231d148ae1de0fb72672658f77d45d64a16ca4eb89e33bd5b2410e3402e0378e07ca597877cb0
-EBUILD gmult-5.3.ebuild 1204 SHA256 d32d60cdecbda2212d7ce9cef2ef59a3755ac9b25bb09f408dd3e9d96ec9cea6 SHA512 165a36a22328354dbf9c0170738e1a7442d5b9cab4f3b3e58c89141ef00a3c3113e7fe4ade245cbc2682523e9fa3a3f5a8d7e9fc02a3b6b403f6db0cf0bc0c0c WHIRLPOOL ecc81ae079994c947d121317bc3fb44389b1afaaccea6018410647100de5fad142b53a68020a139fbc3d9d89d3df145c51663b0dd53907e0f719e3e5e96e687c
-EBUILD gmult-8.0.ebuild 932 SHA256 0af19b5567743576b745a4ae167712cb5b2c906f43de3f63192bb28c2a132423 SHA512 25523a85394957cab511a95fc74ffd719de8458099bdf796d4662283789c2df5f54145331c2eac0b779869b438dbd1ad5d325f5744937b47b5c501755181fd41 WHIRLPOOL 37e06a36ad88bdaf9044f71d9ccd653aba1e91229d45e902ecf07015ddf3bc998dcf38f056474c41c06a03b4f3ad826088874b44fba3e5198cb3bc24f261cd75
-MISC ChangeLog 2214 SHA256 f8fee46b015312dcaa78f53e24e542eb4ccdc8abe428e869f170f58f65f5c91e SHA512 c078ce64609328a7238ee4e9f7344b72d32dcd20a018024753bcd6c16e5ccce36a46d677e5ac7e354d0bb5fd6e0a3e99af26330c29fa110944876b27d2f72ae6 WHIRLPOOL 89bb1b2029766998c19d271cd02469b762e753933ca09c1b5404104a96a25bf8278c82b0a24b321896bf35b75f3bf1bd78ce98957a13e68350d2880d97df1a0a
+EBUILD gmult-8.0.ebuild 968 SHA256 419fa3f2078a7e79a242a95163bb2b0b4a2ca229acc3cda1065137c710af0586 SHA512 b5878ce39148b17d0fde20d8ae96a6453ce23558bfb545f816db815b03499cef07b768a7cd49fbab94a76adb679fbfbd82f94e3b10786ddf48761687f78ce0db WHIRLPOOL 38f475797f735f1ef8afbc787290af0f95a29712f086f864842e3060fa7f3341a1fd66017e0843b0bcc693f1c2fa98ed2bd53a3bb4b7feb9c3ffe7b15790874f
+MISC ChangeLog 2389 SHA256 672803dcb46b00f298875bb8ab9bd39a1b29be4b822843a8b96b2bc0414f9d59 SHA512 5c100c7239f040ebcbe366239bb12d542f0735b60f5262c99e6a051bb86065af2dbc7f209ca1d822c9640493251543585c69fc1b789c97677f14538a632ba62a WHIRLPOOL 9276dd6f6b7321692d6ab38a90b2cb72fd3b534d07223ee27da988d3444a68ffc4d9f1ee98c55f7f93c7d4b902b6eb7f94e8709f5aa0573dee629212c7d85539
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSuYF/AAoJELp701BxlEWf+5cP/0r+UecGYlxuaC3NGQI2uy5z
-3Ciu+0xwo3VMi6KyWQJvWljwghdabEpgADdIc3lO60mWZkNnxjiw6nBuQlB/VTiB
-ZWzEWHuR1KU4UGuwNEBERz0SgRSpqdXg3i6Dw6EAxkdy9l7+KxKsYSd/ANdE/Y4d
-tjDWilUIJqpJyOpFKB5rBu5Ff3PGvBWNkvcwUoJx5PYltP+6vAfeg0BDxKKKF/S1
-d/eTBVrnOaE9Yp+M12CxUqtVzfnhIVEto6DWGN3X2vNi/jd4bMM7yrWesqAU3EH9
-S0cNSvPdxDgJGB0ZqJ+iesTjFtQPRPwmotukURF3xxKAe4ln+CALEwBooP1mHeAH
-C2yfprLw9HcXmHcLpY2knG7rjXedmSa07tKrsC2it+JtEWJVLXu1ROlm7XFxDCkG
-o/vLflEtrko2jNH+t3GgazR5FeESsmArWRd6cjrZMlV0LzAVoDzPGdV7JSR0x06w
-/u8iN6I8FYbbWOCkej57QPr4GTS7r3vhtmUpSITj61g1w1jgG5i1YtHsz11ai6V/
-JhYECR16VKNYGV8F6O5hRug7FttT4h9qQKbSAY7unqj+va4E+0QhOUC7gBwT+Bir
-rLH5j5yP+PK7o5XUVzYB6O0bVjz0fXy/TO0iIoAAVor/NQUxZoJexuhsdduKT8pQ
-N2m07A2K/8UMF/e5/z8d
-=YxOZ
------END PGP SIGNATURE-----
diff --git a/games-kids/gmult/files/gmult-5.3-gcc43.patch b/games-kids/gmult/files/gmult-5.3-gcc43.patch
deleted file mode 100644
index 74b2f2041cc4..000000000000
--- a/games-kids/gmult/files/gmult-5.3-gcc43.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- gmult/DigitChooser.cpp
-+++ gmult/DigitChooser.cpp
-@@ -19,6 +19,7 @@
- #include "DigitChooser.h"
- #include "config.h"
- #include "gettext.h"
-+#include <cstring>
- 
- DigitChooser::DigitChooser (Gtk::Window &parent, MultPuzzle &puzzle, char letter)
- 	: Gtk::Dialog ("", parent, true, false)
---- gmult/GtkMult.cpp
-+++ gmult/GtkMult.cpp
-@@ -3,6 +3,7 @@
- #include "config.h"

- #include "gettext.h"

- 
-+#include <cstring>
- #include <gtkmm/icontheme.h>

- 

- GtkMult::GtkMult (void)

---- gmult/GtkMultTable.cpp
-+++ gmult/GtkMultTable.cpp
-@@ -22,7 +22,8 @@
- #include "DigitChooser.h"
- #include "config.h"
- #include "gettext.h"
--#include <ctype.h>
-+#include <cctype>
-+#include <cstring>
- 
- GtkMultTable::GtkMultTable (MultPuzzle *p)
- 	: Gtk::Table (1, 1, TRUE), puzzle (p)
diff --git a/games-kids/gmult/gmult-5.3.ebuild b/games-kids/gmult/gmult-5.3.ebuild
deleted file mode 100644
index a67d0cf2c035..000000000000
--- a/games-kids/gmult/gmult-5.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/gmult-5.3.ebuild,v 1.6 2011/10/19 21:14:37 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils gnome2-utils games
-
-DESCRIPTION="Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs"
-HOMEPAGE="http://www.mterry.name/gmult/"
-SRC_URI="http://www.mterry.name/gmult/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-cpp/gtkmm-2.6:2.4
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	sed -i -e 's/-pedantic//' gmult/Makefile.in || die
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/FilePattern/d' \
-		-e '/Categories/s/Application;//' \
-		gmult.desktop.in || die
-}
-
-src_configure() {
-	egamesconf \
-		--datadir=/usr/share
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README THANKS
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-kids/gmult/gmult-8.0.ebuild b/games-kids/gmult/gmult-8.0.ebuild
index 0837c6917cd0..b803defaa546 100644
--- a/games-kids/gmult/gmult-8.0.ebuild
+++ b/games-kids/gmult/gmult-8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/gmult-8.0.ebuild,v 1.4 2013/12/24 12:43:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/gmult-8.0.ebuild,v 1.5 2014/06/27 05:53:15 mr_bones_ Exp $
 
 EAPI=5
-inherit eutils gnome2-utils games
+inherit eutils gnome2-utils flag-o-matic games
 
 DESCRIPTION="Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs"
 HOMEPAGE="http://www.mterry.name/gmult/"
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
+	append-libs -lm
 	econf \
 		--bindir="${GAMES_BINDIR}"
 }