amd64 stable wrt #283959

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 25 insertions, 54 deletions

diff --git a/media-libs/guilib/ChangeLog b/media-libs/guilib/ChangeLog
index a28b3990e6cc..feb7624fa887 100644
--- a/media-libs/guilib/ChangeLog
+++ b/media-libs/guilib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/guilib
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/guilib/ChangeLog,v 1.14 2006/09/29 17:51:36 hd_brummy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/guilib/ChangeLog,v 1.15 2009/09/12 10:39:55 ssuominen Exp $
+
+  12 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> guilib-1.1.0-r1.ebuild:
+  amd64 stable wrt #283959
 
   29 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/guilib-1.1.0-gcc-4.1.x-fix.diff, guilib-1.1.0.ebuild,
diff --git a/media-libs/guilib/guilib-1.1.0-r1.ebuild b/media-libs/guilib/guilib-1.1.0-r1.ebuild
index af2ee088a2a4..7dd30f9763f7 100644
--- a/media-libs/guilib/guilib-1.1.0-r1.ebuild
+++ b/media-libs/guilib/guilib-1.1.0-r1.ebuild
@@ -1,38 +1,37 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/guilib/guilib-1.1.0-r1.ebuild,v 1.12 2006/09/29 17:51:36 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/guilib/guilib-1.1.0-r1.ebuild,v 1.13 2009/09/12 10:39:55 ssuominen Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
-MY_P="GUIlib-${PV}"
+MY_P=GUIlib-${PV}
+
 DESCRIPTION="a simple widget set for SDL"
 SRC_URI="http://www.libsdl.org/projects/GUIlib/src/${MY_P}.tar.gz"
 HOMEPAGE="http://www.libsdl.org/projects/GUIlib/"
 
-SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc alpha ~hppa ~amd64"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.0.1"
+RDEPEND=">=media-libs/libsdl-1.0.1"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}.makefile.patch
-	epatch ${FILESDIR}/${P}-gcc-4.1.x-fix.diff
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.makefile.patch \
+		"${FILESDIR}"/${P}-gcc-4.1.x-fix.diff
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC CXX LD
-
-	econf || die "econf failed"
-	emake || die "emake failed"
+	econf
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc CHANGES README
 }
diff --git a/media-libs/guilib/guilib-1.1.0.ebuild b/media-libs/guilib/guilib-1.1.0.ebuild
deleted file mode 100644
index 24a0b4f6df98..000000000000
--- a/media-libs/guilib/guilib-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/guilib/guilib-1.1.0.ebuild,v 1.9 2006/09/29 17:51:36 hd_brummy Exp $
-
-inherit eutils
-
-MY_P="GUIlib-${PV}"
-DESCRIPTION="a simple widget set for SDL"
-SRC_URI="http://www.libsdl.org/projects/GUIlib/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libsdl.org/projects/GUIlib/"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc ~amd64"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.0.1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}.makefile.patch
-	epatch ${FILESDIR}/${P}-gcc-4.1.x-fix.diff
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc CHANGES README
-}
diff --git a/media-libs/guilib/metadata.xml b/media-libs/guilib/metadata.xml
index edccfe5754d2..c572c7d9b478 100644
--- a/media-libs/guilib/metadata.xml
+++ b/media-libs/guilib/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<maintainer>
-<email>media-video@gentoo.org</email>
-</maintainer>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>