amd64 stable wrt #283959

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 28 insertions, 58 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/Manifest b/media-libs/guilib/Manifest
index 144fac2817dd..ee12fa913922 100644
--- a/media-libs/guilib/Manifest
+++ b/media-libs/guilib/Manifest
@@ -1,7 +1,6 @@
 AUX guilib-1.1.0-gcc-4.1.x-fix.diff 814 RMD160 577b474124eab6ee957ecf2000ec0a606e221c56 SHA1 7d1d5ec29dc3cb883cebc040d281b64cf7daec98 SHA256 6422fb1dfe0c04ae7b7e6560c95b7b7aa9accd1a900d60c7f3bb2950e20b6a12
 AUX guilib-1.1.0.makefile.patch 993 RMD160 51a7a9c1742ed37f2d2b78c8f58a3252592129dd SHA1 e4b42e3f59a6d8a9c721ec7004284cedec561495 SHA256 bc8c8026948935fa3b78a5bba1751b40f875bc7b708d29de6d2cdc0363481d07
 DIST GUIlib-1.1.0.tar.gz 180318 RMD160 aeed496d4d92c0f3a28531fb37def7b69c78109a SHA1 4ba285dc9902c6204663a935ee3d8600cc921cc9 SHA256 d8a66f2225b4d9c7c027d031d9020f05612151b473ced2645a10176a5f093442
-EBUILD guilib-1.1.0-r1.ebuild 897 RMD160 5a31b5db0eaef518d8afa3b848c06e5c1fc844a2 SHA1 37b7ffba79c02820c960092283f759ff57b0d633 SHA256 624c26f206668d6f8d59b0321aad5a79b7d6e224539a21f603ce8ad3feac1df3
-EBUILD guilib-1.1.0.ebuild 766 RMD160 f85316ed45e1045db843a85cdcd8e6878819c958 SHA1 14d596395d308947d3712e319bb2e7921d0bf854 SHA256 c835281bc1d885608bb91a2aa79945533c8e7febe0002ba703b7b95b693b4452
-MISC ChangeLog 2005 RMD160 6424c4d74fd35df92903d95c679a179afa41042c SHA1 49dce9deffce7e6f2b8b94c6444dad4763b8931e SHA256 e2be3c2e79b62a3f740d124142095320521db5ba1520776affa9108bb14aed4c
-MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+EBUILD guilib-1.1.0-r1.ebuild 831 RMD160 198c6677313e3077ae93824d327f99c9144bbb8f SHA1 4ec13bd6606ba11948d736ecbe1bf33c59dfd604 SHA256 7c12b71b28a9a1f5d0bcfbfb5f4903a449f6298fb9d80698defa2490b33bb9bf
+MISC ChangeLog 2111 RMD160 088f178016b2adaa9a6bf227e06073335957be02 SHA1 d349de80199b7f5890fce56fe8f347752d15a483 SHA256 6ad844550a09fa98220c862f15b19d056f7d0f420d1bd18f01f0c029e963100f
+MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
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>