Cleanup build and fix compressed manpage.

(Portage version: 2.1.2-r3)

4 files changed, 78 insertions, 10 deletions

diff --git a/app-cdr/plextor-tool/ChangeLog b/app-cdr/plextor-tool/ChangeLog
index a7c89ca003f9..e49cb2a988f9 100644
--- a/app-cdr/plextor-tool/ChangeLog
+++ b/app-cdr/plextor-tool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/plextor-tool
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/plextor-tool/ChangeLog,v 1.1 2005/12/24 05:24:57 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/plextor-tool/ChangeLog,v 1.2 2007/01/26 08:27:42 vapier Exp $
+
+  26 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/plextor-tool-0.5.0-build.patch, plextor-tool-0.5.0.ebuild:
+  Cleanup build and fix compressed manpage.
 
 *plextor-tool-0.5.0 (29 Aug 2004)
 
diff --git a/app-cdr/plextor-tool/files/digest-plextor-tool-0.5.0 b/app-cdr/plextor-tool/files/digest-plextor-tool-0.5.0
index e9223a9663d5..aa356ab68415 100644
--- a/app-cdr/plextor-tool/files/digest-plextor-tool-0.5.0
+++ b/app-cdr/plextor-tool/files/digest-plextor-tool-0.5.0
@@ -1 +1,3 @@
 MD5 f3919c04e39bd71fddc8327331316113 plextor-tool-0.5.0.src.tar.bz2 51594
+RMD160 041e1362bf3f0c86e020e2cd7766d29740a04bdc plextor-tool-0.5.0.src.tar.bz2 51594
+SHA256 a62787eb2a1f311b66a467777aa864a1e478a649895ba2708f8f46e85e5bd20a plextor-tool-0.5.0.src.tar.bz2 51594
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
new file mode 100644
index 000000000000..8026201bc33a
--- /dev/null
+++ b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
@@ -0,0 +1,61 @@
+--- src/Makefile
++++ src/Makefile
+@@ -2,17 +2,17 @@
+ #               Copyright (c) 1999-2002 Georg Huettenegger
+ #
+ 
+-CC=gcc
+-INCLUDES=-Icommon/
++CC?=gcc
++CPPFLAGS+=-Icommon/
+ 
+ # defines to be set for release
+ 
+-DEFINES=-DUSE_GNOME
+-SCFLAGS=-Wall $(DEFINES) $(INCLUDES)
+-CFLAGS=`gnome-config --cflags applets` $(SCFLAGS)
+-LFLAGS=`gnome-config --libs applets`
++CPPFLAGS += -DUSE_GNOME
++CFLAGS += -Wall
++CFLAGS +=`gnome-config --cflags applets`
++LFLAGS=$(LDFLAGS) `gnome-config --libs applets`
+ # 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
+ # the following line worked on RedHat 6.1
+ #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 -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
+ 
+@@ -53,18 +53,16 @@
+ RM=rm
+ STRIP=strip
+ 
+-all:	plextor-tool pt-static plextor-tool-applet pta-static plextor-tool.8.gz strip
++all:	plextor-tool pt-static plextor-tool-applet pta-static plextor-tool.8
+ 
+-plextor-tool.8.gz:	../doc/plextor-tool.groff
++plextor-tool.8:	../doc/plextor-tool.groff
+ 	$(MANCC) $(MANCCFLAGS) ../doc/plextor-tool.groff > plextor-tool.8
+-	$(RM) -f plextor-tool.8.gz
+-	gzip plextor-tool.8
+ 
+ plextor-tool:	$(COBJS)
+-	$(CC) -o $@ $(COBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ pt-static:	$(COBJS)
+-	$(CC) -static -o $@ $(COBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^
+ 
+ ls_mode_pages:	$(LSMPOBJS)
+ 	$(CC) -o $@ $(LSMPOBJS)
+@@ -110,10 +108,8 @@
+ 
+ .SUFFIXES: .o .cpp
+ .cpp.o:
+-	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ 
+ .SUFFEXES: .o .c
+ .c.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
+ 
+ include .depend
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 ab3220de57ad..84943a56e1c0 100644
--- a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
+++ b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2006/09/10 08:11:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild,v 1.3 2007/01/26 08:27:42 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive"
 HOMEPAGE="http://plextor-tool.sourceforge.net/"
@@ -17,10 +19,9 @@ S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"/src
-	sed -i \
-		-e "/^CFLAGS=/s:$: ${CFLAGS}:" \
-		Makefile || die "sed Makefile failed"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	gunzip src/plextor-tool.8.gz || die
 }
 
 src_compile() {
@@ -34,9 +35,9 @@ src_compile() {
 }
 
 src_install() {
-	local targets="$(<src/my-make-targets)"
+	local targets=$(<src/my-make-targets)
 	dodoc src/TODO doc/README doc/NEWS
 	cd src
 	dobin ${targets} || die "dobin failed"
-	doman plextor-tool.8.gz
+	doman plextor-tool.8
 }