Stop building the gnome-panel 2.x applet (and modify the -build.patch to not call gnome-config) wrt #345449 by Martin von Gagern

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 22 insertions, 25 deletions

diff --git a/app-cdr/plextor-tool/ChangeLog b/app-cdr/plextor-tool/ChangeLog
index 839226ab4641..3da64a705c2f 100644
--- a/app-cdr/plextor-tool/ChangeLog
+++ b/app-cdr/plextor-tool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/plextor-tool
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/plextor-tool/ChangeLog,v 1.3 2009/05/07 20:30:40 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/plextor-tool/ChangeLog,v 1.4 2013/08/27 14:06:50 ssuominen Exp $
+
+  27 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  files/plextor-tool-0.5.0-build.patch, plextor-tool-0.5.0.ebuild:
+  Stop building the gnome-panel 2.x applet (and modify the -build.patch to not
+  call gnome-config) wrt #345449 by Martin von Gagern
 
   07 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   plextor-tool-0.5.0.ebuild:
diff --git a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
index 8026201bc33a..d2a181f14fed 100644
--- a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
+++ b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
@@ -1,5 +1,5 @@
---- src/Makefile
-+++ src/Makefile
+--- Makefile
++++ Makefile
 @@ -2,17 +2,17 @@
  #               Copyright (c) 1999-2002 Georg Huettenegger
  #
@@ -17,8 +17,8 @@
 -LFLAGS=`gnome-config --libs applets`
 +CPPFLAGS += -DUSE_GNOME
 +CFLAGS += -Wall
-+CFLAGS +=`gnome-config --cflags applets`
-+LFLAGS=$(LDFLAGS) `gnome-config --libs applets`
++CFLAGS +=
++LFLAGS=$(LDFLAGS)
  # the following line worked on RedHat 7.0/1/2
 -SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
 +#SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
diff --git a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
index cdf6cc5a6fdc..48ed08b17ce6 100644
--- a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
+++ b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild,v 1.4 2009/05/07 20:30:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild,v 1.5 2013/08/27 14:06:50 ssuominen Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive"
@@ -11,34 +12,25 @@ SRC_URI="mirror://sourceforge/plextor-tool/${P}.src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static gnome"
+IUSE="static"
 
-RDEPEND="gnome? ( gnome-base/gnome-panel )"
-DEPEND="${RDEPEND}"
+S=${WORKDIR}/${PN}/src
 
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
-	gunzip src/plextor-tool.8.gz || die
+	gunzip plextor-tool.8.gz || die
 }
 
 src_compile() {
-	cd "${S}"/src
 	local targets="plextor-tool"
 	use static && targets="${targets} pt-static"
-	use gnome && targets="${targets} plextor-tool-applet"
-#	use static && use gnome && targets="${targets} pta-static"
 	echo ${targets} > my-make-targets
-	emake CC="$(tc-getCC)" ${targets} || die "make ${targets} failed"
+	emake CC="$(tc-getCC)" ${targets}
 }
 
 src_install() {
-	local targets=$(<src/my-make-targets)
-	dodoc src/TODO doc/README doc/NEWS
-	cd src
-	dobin ${targets} || die "dobin failed"
+	local targets=$(<my-make-targets)
+	dodoc ../doc/{NEWS,README} TODO
+	dobin ${targets}
 	doman plextor-tool.8
 }