Remove media-libs/imlib dependency, bug #166073

(Portage version: 2.1.2-r9)

5 files changed, 15 insertions, 134 deletions

diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index 8b83e0a3abf2..94248c9b0828 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/eboard
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.15 2007/02/09 07:18:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.16 2007/02/13 19:06:02 nyhm Exp $
+
+  13 Feb 2007; Tristan Heaven <nyhm@gentoo.org> eboard-1.0.3.ebuild:
+  Remove media-libs/imlib dependency, bug #166073
 
 *eboard-1.0.3 (09 Feb 2007)
 
diff --git a/games-board/eboard/eboard-0.9.5.ebuild b/games-board/eboard/eboard-0.9.5.ebuild
deleted file mode 100644
index a5304d84b5d2..000000000000
--- a/games-board/eboard/eboard-0.9.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-0.9.5.ebuild,v 1.13 2006/10/05 17:25:51 nyhm Exp $
-
-inherit eutils games
-
-EXTRAS1="eboard-extras-1pl2"
-EXTRAS2="eboard-extras-2"
-DESCRIPTION="chess interface for POSIX systems"
-HOMEPAGE="http://eboard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/eboard/${P}.tar.gz
-	mirror://sourceforge/eboard/${EXTRAS1}.tar.gz
-	mirror://sourceforge/eboard/${EXTRAS2}.tar.gz
-	mirror://gentoo/${P}-gcc41.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="nls"
-
-RDEPEND="=x11-libs/gtk+-1*
-	>=media-libs/imlib-1.9.7
-	dev-lang/perl
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc4.patch \
-		../${P}-gcc41.patch
-
-	sed -i \
-		-e "/DATADIR/ s:\$prefix/share:${GAMES_DATADIR}:" \
-		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" configure \
-		|| die "sed configure failed"
-}
-
-src_compile() {
-	egamesconf $(use_enable nls) || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix="${D}/${GAMES_PREFIX}" \
-		bindir="${D}/${GAMES_BINDIR}" \
-		mandir="${D}/usr/share/man" \
-		datadir="${D}/${GAMES_DATADIR}/${PN}" \
-			install || die "make install failed"
-	dodoc README AUTHORS ChangeLog TODO Documentation/* || die "dodoc failed"
-
-	cd "${WORKDIR}/${EXTRAS1}"
-	insinto "${GAMES_DATADIR}/eboard"
-	doins *.png *.wav || die "doins failed (extra1)"
-	newins extras1.conf themeconf.extras1 || die "newins failed (extra1)"
-	newdoc ChangeLog Changelog.extras || die "newdoc failed (extra1.1)"
-	newdoc README README.extras || die "newdoc failed (extra1.2)"
-	dodoc CREDITS || die "dodoc failed (extra1)"
-
-	cd "${WORKDIR}/${EXTRAS2}"
-	doins *.png *.wav || die "doins failed (extra2)"
-	newins extras2.conf themeconf.extras2 || die "newins failed (extra2)"
-
-	prepgamesdirs
-}
diff --git a/games-board/eboard/eboard-1.0.3.ebuild b/games-board/eboard/eboard-1.0.3.ebuild
index 72513e28536b..b4f9d1b2cb98 100644
--- a/games-board/eboard/eboard-1.0.3.ebuild
+++ b/games-board/eboard/eboard-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.0.3.ebuild,v 1.1 2007/02/09 07:18:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.0.3.ebuild,v 1.2 2007/02/13 19:06:02 nyhm Exp $
 
 inherit eutils games
 
@@ -8,17 +8,17 @@ EXTRAS1="eboard-extras-1pl2"
 EXTRAS2="eboard-extras-2"
 DESCRIPTION="chess interface for POSIX systems"
 HOMEPAGE="http://eboard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/eboard/${P}.tar.bz2
-	mirror://sourceforge/eboard/${EXTRAS1}.tar.gz
-	mirror://sourceforge/eboard/${EXTRAS2}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://sourceforge/${PN}/${EXTRAS1}.tar.gz
+	mirror://sourceforge/${PN}/${EXTRAS2}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
-RDEPEND=">=x11-libs/gtk+-2.2.0
-	>=media-libs/imlib-1.9.7
+RDEPEND=">=x11-libs/gtk+-2
+	media-libs/libpng
 	dev-lang/perl
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -41,14 +41,17 @@ src_compile() {
 }
 
 src_install() {
-	make \
+	emake \
 		prefix="${D}/${GAMES_PREFIX}" \
 		bindir="${D}/${GAMES_BINDIR}" \
 		mandir="${D}/usr/share/man" \
 		datadir="${D}/${GAMES_DATADIR}/${PN}" \
-			install || die "make install failed"
+		install || die "emake install failed"
 	dodoc README AUTHORS ChangeLog TODO Documentation/* || die "dodoc failed"
 
+	newicon k18.xpm ${PN}.xpm
+	make_desktop_entry ${PN} ${PN} ${PN}.xpm
+
 	cd "${WORKDIR}/${EXTRAS1}"
 	insinto "${GAMES_DATADIR}/eboard"
 	doins *.png *.wav || die "doins failed (extra1)"
diff --git a/games-board/eboard/files/digest-eboard-0.9.5 b/games-board/eboard/files/digest-eboard-0.9.5
deleted file mode 100644
index c6091db4b032..000000000000
--- a/games-board/eboard/files/digest-eboard-0.9.5
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 af3e1601e9861c542982c1dd865ff590 eboard-0.9.5-gcc41.patch.bz2 4241
-RMD160 4117ec2c30b94b1b0eb2dabd579eee522fc3f6b2 eboard-0.9.5-gcc41.patch.bz2 4241
-SHA256 a4259f02a2de23e9b0daa193c6fbe1b414213193dc05bf30a55b54f6619ba154 eboard-0.9.5-gcc41.patch.bz2 4241
-MD5 2c22384e0a75c6037eb795df41e3c63b eboard-0.9.5.tar.gz 449330
-RMD160 98021c4177e2a4c0213e39dc5dee53b2ee2cd059 eboard-0.9.5.tar.gz 449330
-SHA256 de9356b5d27b3aca4b48e6521fb2e20222ccf65b87f20f002b249ea640e7ac7f eboard-0.9.5.tar.gz 449330
-MD5 d5fb7a541d9ef5f6d1d565d877b1ab9a eboard-extras-1pl2.tar.gz 361237
-RMD160 342b1b48091958f5b0e4613e1c9de8b6c23d5b67 eboard-extras-1pl2.tar.gz 361237
-SHA256 6849cc104e454167db8b8e9ae0573accade5c941a140b47e58b601164e99fcc3 eboard-extras-1pl2.tar.gz 361237
-MD5 e0994803fdd2b3c6b2367efeaa841a34 eboard-extras-2.tar.gz 598909
-RMD160 d6b7b9f39167752301018048010fee312acb97c0 eboard-extras-2.tar.gz 598909
-SHA256 0b98bd4c90b2e275f8535186c3e7cbeeef9c9bb611a7febfcd866486a9f41a9c eboard-extras-2.tar.gz 598909
diff --git a/games-board/eboard/files/eboard-0.9.5-gcc4.patch b/games-board/eboard/files/eboard-0.9.5-gcc4.patch
deleted file mode 100644
index b761591f19aa..000000000000
--- a/games-board/eboard/files/eboard-0.9.5-gcc4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- eboard-0.9.5/board.cc.orig	2005-11-11 02:18:41.000000000 +0100
-+++ eboard-0.9.5/board.cc	2005-11-11 02:19:20.000000000 +0100
-@@ -1059,8 +1059,8 @@
-   cerr.setf(ios::hex,ios::basefield);
-   cerr.setf(ios::showbase);
- 
--  cerr << "[board " << ((unsigned int)this) << "] ";
--  cerr << "game=[" << ((unsigned int)mygame) << "] ";
-+  cerr << "[board " << ((unsigned long)this) << "] ";
-+  cerr << "game=[" << ((unsigned long)mygame) << "] ";
- 
-   cerr.setf(ios::dec,ios::basefield);
-   cerr << "paneid=" << getPageId() << endl;
---- eboard-0.9.5/chess.cc.orig	2005-11-11 02:19:45.000000000 +0100
-+++ eboard-0.9.5/chess.cc	2005-11-11 02:20:02.000000000 +0100
-@@ -641,7 +641,7 @@
-   cerr.setf(ios::hex,ios::basefield);
-   cerr.setf(ios::showbase);
- 
--  cerr << "[game " << ((unsigned int)this) << "] ";
-+  cerr << "[game " << ((unsigned long)this) << "] ";
- 
-   cerr.setf(ios::dec,ios::basefield);
- 
-@@ -655,7 +655,7 @@
-   cerr.setf(ios::hex,ios::basefield);
-   cerr.setf(ios::showbase);
- 
--  cerr << "board=[" << ((unsigned int)myboard) << "]" << endl;
-+  cerr << "board=[" << ((unsigned long)myboard) << "]" << endl;
- }
- 
- char * ChessGame::getPlayerString(int index) {
---- eboard-0.9.5/notebook.cc.orig	2005-11-11 02:20:41.000000000 +0100
-+++ eboard-0.9.5/notebook.cc	2005-11-11 02:20:54.000000000 +0100
-@@ -127,7 +127,7 @@
- void Page::dump() {
-   cerr.setf(ios::hex,ios::basefield);
-   cerr.setf(ios::showbase);
--  cerr << "[page " << ((unsigned int)this) << "] ";
-+  cerr << "[page " << ((unsigned long)this) << "] ";
-   cerr.setf(ios::dec,ios::basefield);
-   cerr << "pageid=" << number << " ";
-   cerr << "title=" << title << " ";