Pass --disable-gnome since it's for GNOME 1.x libs. Removed USE gnome.

Package-Manager: portage-2.1.5

4 files changed, 27 insertions, 29 deletions

diff --git a/app-arch/guitar/ChangeLog b/app-arch/guitar/ChangeLog
index 5f353195e811..cf144f1e0714 100644
--- a/app-arch/guitar/ChangeLog
+++ b/app-arch/guitar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/guitar
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/guitar/ChangeLog,v 1.18 2007/08/29 16:58:35 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/guitar/ChangeLog,v 1.19 2008/05/19 14:14:39 drac Exp $
+
+  19 May 2008; Samuli Suominen <drac@gentoo.org> -files/install.gnome,
+  guitar-0.1.4.ebuild:
+  Pass --disable-gnome since it's for GNOME 1.x libs. Removed USE gnome.
 
   29 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing agriffis from metadata due to his retirement (see #182294 for
diff --git a/app-arch/guitar/Manifest b/app-arch/guitar/Manifest
index 6acf07230b18..8b962b0c5b28 100644
--- a/app-arch/guitar/Manifest
+++ b/app-arch/guitar/Manifest
@@ -1,5 +1,4 @@
-AUX install.gnome 495 RMD160 831033c77c8b631714ee03e76a2baa50853426dd SHA1 dd9105f3b4d7abb93a97085ae9db89a6ffdbf3ae SHA256 74110dc876f5e2ee432a65498431476de40bf1a13031517de11ffb56a72150f4
 DIST guiTAR-0.1.4.tar.gz 124369 RMD160 b0089b4b0cc2135d8f24e60c73413bf89dad7dab SHA1 5321e333cc8000bb0cb20cbafcc77060ca53abe2 SHA256 8bb3b7c6889516058683f127b47a79dc068dc050173dd5d57a72d2ed88d9e4f2
-EBUILD guitar-0.1.4.ebuild 859 RMD160 d5ecbf4a6fda1f631752a4f1d2f59bc41887f2eb SHA1 c73bc8144d24d413360481b8b0771358faebfd64 SHA256 b9455160908f7154e87c7d3843492202e225abda177ad56bc09fc0a50efe11e9
-MISC ChangeLog 1886 RMD160 a40fd23d1399eebb2458e4ba3f1eb716693cbb91 SHA1 cfe5ce30728b45993a32e87bfefc9787d2440807 SHA256 717ba7ea7746599e33de41370b19bbae520157068e48a4f24f363a7aed4f8aa8
+EBUILD guitar-0.1.4.ebuild 1058 RMD160 fbf3fd96ca89f9c1f43cd6f6c70cd7ccf80af298 SHA1 f47f5d8bd3b0baa8e135483b821f7b3661f4814c SHA256 1167f73f57cf11bfbf98922532d8e47187770ee02c8c4c879a6fb5f4ca2a1c8c
+MISC ChangeLog 2052 RMD160 2c17ba190ed0877ff32fd020f51a96cfe8befa70 SHA1 159c7b2f7303b7a63f3753648de02423d6425f44 SHA256 fa10e0af3c072cb20b0f5e3bd67d4fb6e677be61f397016dea81827301395d40
 MISC metadata.xml 382 RMD160 a1bd77c7a611d384b8c9ee8fa3100fbe39eedd34 SHA1 7f9f29116dae387ea38106082e48b10f19ff2ee5 SHA256 68a1ec41905bc1f723c5d1191cf01c9cac4bc241325a1f1b6cfbcd01281dc8c7
diff --git a/app-arch/guitar/files/install.gnome b/app-arch/guitar/files/install.gnome
deleted file mode 100644
index 0d3e7a1013f9..000000000000
--- a/app-arch/guitar/files/install.gnome
+++ /dev/null
@@ -1,12 +0,0 @@
-
-if [ -e ./using_gnome ]; then
-  if [ "$1" = "uninstall" ]; then
-	rm ${D}/`gnome-config --prefix`/share/pixmaps/guiTAR.xpm
-	rm ${D}/`gnome-config --prefix`/share/gnome/apps/Utilities/guiTAR.desktop
-  else
-  	./mkinstalldirs ${D}/`gnome-config --prefix`/share/pixmaps
-	cp -f src/guiTAR.xpm ${D}/`gnome-config --prefix`/share/pixmaps/
-  	./mkinstalldirs ${D}/`gnome-config --prefix`/share/gnome/apps/Utilities
-	cp -f guiTAR.desktop ${D}/`gnome-config --prefix`/share/gnome/apps/Utilities/
-  fi
-fi
diff --git a/app-arch/guitar/guitar-0.1.4.ebuild b/app-arch/guitar/guitar-0.1.4.ebuild
index 1d62eb7f49cf..793eff7c027a 100644
--- a/app-arch/guitar/guitar-0.1.4.ebuild
+++ b/app-arch/guitar/guitar-0.1.4.ebuild
@@ -1,33 +1,40 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/guitar/guitar-0.1.4.ebuild,v 1.28 2005/01/01 11:45:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/guitar/guitar-0.1.4.ebuild,v 1.29 2008/05/19 14:14:39 drac Exp $
+
+inherit eutils toolchain-funcs
 
 MY_P=guiTAR-${PV}
-S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Extraction tool, supports tar, tar.Z, tar.gz, tar.bz2, lha, lzh, rar, arj, zip, and slp formats"
-HOMEPAGE="http://artemis.efes.net/disq/guitar/"
-SRC_URI="http://artemis.efes.net/disq/guitar/${MY_P}.tar.gz"
+# No HOMEPAGE available. Debian has this left in oldstable.
+HOMEPAGE="http://packages.debian.org/sarge/guitar"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="gnome"
+IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*
 	app-arch/tar
 	app-arch/bzip2
-	x86? ( app-arch/rar )
-	app-arch/unrar
 	app-arch/gzip
 	app-arch/zip
 	app-arch/unzip"
 
+S=${WORKDIR}/${MY_P}
+
 src_compile() {
-	econf $(use_enable gnome) || die
-	emake || die
+	tc-export CC
+	# Disable GNOME 1.x library support.
+	econf --disable-gnome
+	emake || die "emake failed."
 }
 
 src_install() {
-	use gnome && cp ${FILESDIR}/install.gnome ${S}
-	make install DESTDIR="${D}" || die
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS BUGS NEWS README TODO
+	newicon src/icon.xpm guiTAR.xpm
+	make_desktop_entry ${PN} "Graphical User Interface for TAR" guiTAR
 }