games-board/sirius: Fix underlinking

Gentoo-bug: 592414
* Turn sed's into PATCHES
* Fix configure.ac
* Include a check for sqrt() in libm
* Simplify ebuild

Package-Manager: portage-2.3.3

4 files changed, 87 insertions, 16 deletions

diff --git a/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch b/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch
new file mode 100644
index 000000000000..e799616a492a
--- /dev/null
+++ b/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch
@@ -0,0 +1,65 @@
+Fix configure.ac
+* Remove setting CFLAGS
+* Look for sqrt() in libm (bug 592414)
+
+--- a/configure.in
++++ b/configure.in
+@@ -1,26 +1,23 @@
+ AC_PREREQ(2.52)
+ 
+-AC_INIT(sirius, 0.8.0)
+-AC_CONFIG_SRCDIR(src/sirius.c)
+-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
++AC_INIT([sirius], [0.8.0])
++AC_CONFIG_SRCDIR([src/sirius.c])
++AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+-AM_MAINTAINER_MODE
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_PROG_INTLTOOL
+ 
+-AC_ISC_POSIX
+ AC_PROG_CC
+-AC_STDC_HEADERS
+-AM_PROG_LIBTOOL
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ pkg_modules="gtk+-2.0 >= 1.3.13 gconf-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libgnomeui-2.0 gdk-pixbuf-2.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+-AC_SUBST(PACKAGE_CFLAGS)
+-AC_SUBST(PACKAGE_LIBS)
+ 
++dnl Look for sqrt() in libm
++AC_SEARCH_LIBS([sqrt], [m], [], [
++	AC_MSG_ERROR([unable to find the sqrt() function])
++])
+ 
+ GETTEXT_PACKAGE=sirius
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
+@@ -29,22 +26,6 @@
+ ALL_LINGUAS="sv fr de ru"
+ AM_GLIB_GNU_GETTEXT
+ 
+-CFLAGS="-g -O3"
+-
+-AC_SUBST(CFLAGS)
+-AC_SUBST(CPPFLAGS)
+-AC_SUBST(LDFLAGS) 
+-
+-dnl Use -Wall if we have gcc.
+-changequote(,)dnl
+-if test "x$GCC" = "xyes"; then
+-  case " $CFLAGS " in
+-  *[\ \	]-Wall[\ \	]*) ;;
+-  *) CFLAGS="$CFLAGS -Wall" ;;
+-  esac
+-fi
+-changequote([,])dnl
+-
+ AC_OUTPUT([
+ Makefile
+ po/Makefile.in
diff --git a/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch b/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch
new file mode 100644
index 000000000000..dfa411d5152b
--- /dev/null
+++ b/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch
@@ -0,0 +1,14 @@
+Fix QA violations in desktop file
+
+--- a/sirius.desktop.in
++++ b/sirius.desktop.in
+@@ -3,7 +3,7 @@
+ _Name=Sirius
+ _Comment=Sirius, a othello playing program
+ Exec=sirius
+-Icon=sirius.png
++Icon=sirius
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Game;
++Categories=GNOME;Game;
diff --git a/games-board/sirius/files/sirius-0.8.0-format.patch b/games-board/sirius/files/sirius-0.8.0-format.patch
index 8dff431bf792..4bed292434d3 100644
--- a/games-board/sirius/files/sirius-0.8.0-format.patch
+++ b/games-board/sirius/files/sirius-0.8.0-format.patch
@@ -1,5 +1,5 @@
---- a/src/sirius.c	2016-01-14 21:22:53.946900371 +0100
-+++ b/src/sirius.c	2016-01-14 21:24:08.240507669 +0100
+--- a/src/sirius.c
++++ b/src/sirius.c
 @@ -180,7 +180,7 @@
  
  	paus = 1;
diff --git a/games-board/sirius/sirius-0.8.0-r1.ebuild b/games-board/sirius/sirius-0.8.0-r1.ebuild
index 443de7db7aa0..68570c1bc240 100644
--- a/games-board/sirius/sirius-0.8.0-r1.ebuild
+++ b/games-board/sirius/sirius-0.8.0-r1.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=6
-inherit autotools eutils
+
+inherit autotools
 
 DESCRIPTION="A program for playing the game of othello/reversi"
 HOMEPAGE="http://sirius.bitvis.nu/"
@@ -25,25 +26,16 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-fix-desktop-file.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
 )
 
 src_prepare() {
 	default
-	sed -i -e '/-g -O3/d' configure.in || die
-	sed -i \
-		-e '/Icon/s/\.png//' \
-		-e '/Categories/s/Application;//' \
-		sirius.desktop.in || die
-	mv configure.in configure.ac || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--datadir=/usr/share \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
+	econf $(use_enable nls)
 }