Fix compilation, bug #515916. Remove old

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

4 files changed, 24 insertions, 39 deletions

diff --git a/x11-plugins/wmlife/ChangeLog b/x11-plugins/wmlife/ChangeLog
index 65b98cd3e7c2..dd479107ad79 100644
--- a/x11-plugins/wmlife/ChangeLog
+++ b/x11-plugins/wmlife/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmlife
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlife/ChangeLog,v 1.7 2014/08/10 20:07:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlife/ChangeLog,v 1.8 2014/09/19 13:22:43 voyageur Exp $
+
+  19 Sep 2014; Bernard Cafarelli <voyageur@gentoo.org> -wmlife-1.0.0.ebuild,
+  wmlife-1.0.1.ebuild, +files/wmlife-1.0.1-configure.patch:
+  Fix compilation, bug #515916. Remove old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> wmlife-1.0.0.ebuild,
   wmlife-1.0.1.ebuild:
diff --git a/x11-plugins/wmlife/files/wmlife-1.0.1-configure.patch b/x11-plugins/wmlife/files/wmlife-1.0.1-configure.patch
new file mode 100644
index 000000000000..35ba4029554f
--- /dev/null
+++ b/x11-plugins/wmlife/files/wmlife-1.0.1-configure.patch
@@ -0,0 +1,11 @@
+diff -Naur wmlife-1.0.0-orig/configure.in wmlife-1.0.0/configure.in
+--- wmlife-1.0.0-orig/configure.in	2005-09-23 00:18:09.000000000 +0300
++++ wmlife-1.0.0/configure.in	2014-04-28 23:52:09.701103219 +0300
+@@ -38,6 +38,6 @@
+ AC_CACHE_CHECK([for gdk2 libs], GDKLIBS, [GDKLIBS=`$config --libs gtk+-2.0 | sed -e "s/-lgtk-x11-2.0//g" -e "s/-latk-1.0//g"`])
+ 
+ CFLAGS="$CFLAGS $GDKINCS"
+-LDFLAGS="$LDFLAGS $GDKLIBS"
++LDFLAGS="$LDFLAGS $GDKLIBS -lm"
+ 
+ AC_OUTPUT(Makefile src/Makefile)
diff --git a/x11-plugins/wmlife/wmlife-1.0.0.ebuild b/x11-plugins/wmlife/wmlife-1.0.0.ebuild
deleted file mode 100644
index 6a6966e99e11..000000000000
--- a/x11-plugins/wmlife/wmlife-1.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlife/wmlife-1.0.0.ebuild,v 1.6 2014/08/10 20:07:13 slyfox Exp $
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="dockapp running Conway's Game of Life (and program launcher)"
-HOMEPAGE="http://www.swanson.ukfsn.org/#wmlife"
-SRC_URI="http://www.swanson.ukfsn.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnomeui-2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stringh.patch
-}
-
-src_configure() {
-	econf --enable-session
-}
diff --git a/x11-plugins/wmlife/wmlife-1.0.1.ebuild b/x11-plugins/wmlife/wmlife-1.0.1.ebuild
index b8b20e195b8f..d02baabd8e85 100644
--- a/x11-plugins/wmlife/wmlife-1.0.1.ebuild
+++ b/x11-plugins/wmlife/wmlife-1.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlife/wmlife-1.0.1.ebuild,v 1.3 2014/08/10 20:07:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlife/wmlife-1.0.1.ebuild,v 1.4 2014/09/19 13:22:43 voyageur Exp $
 
 EAPI=5
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="dockapp running Conway's Game of Life (and program launcher)"
 HOMEPAGE="http://www.swanson.ukfsn.org/#wmlife"
@@ -27,8 +27,14 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-stringh.patch
+	"${FILESDIR}"/${P}-configure.patch )
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.0-stringh.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+
+	eautoreconf
 }
 
 src_configure() {