From 9f6b8a7c8675e79ddf102135ae089e688996e043 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 26 Jan 2007 08:27:42 +0000 Subject: [PATCH] Cleanup build and fix compressed manpage. Package-Manager: portage-2.1.2-r3 --- app-cdr/plextor-tool/ChangeLog | 8 ++- app-cdr/plextor-tool/Manifest | 38 ++++++++---- .../files/digest-plextor-tool-0.5.0 | 2 + .../files/plextor-tool-0.5.0-build.patch | 61 +++++++++++++++++++ .../plextor-tool/plextor-tool-0.5.0.ebuild | 17 +++--- 5 files changed, 104 insertions(+), 22 deletions(-) create mode 100644 app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch 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 + +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/Manifest b/app-cdr/plextor-tool/Manifest index 31d62390ddf4..1690e6a36677 100644 --- a/app-cdr/plextor-tool/Manifest +++ b/app-cdr/plextor-tool/Manifest @@ -1,16 +1,30 @@ -DIST plextor-tool-0.5.0.src.tar.bz2 51594 -EBUILD plextor-tool-0.5.0.ebuild 1145 RMD160 31de1580a40aacbeed9b206b09bae6702b760285 SHA1 ed9c815decc095b7037117b21a194fb836fab003 SHA256 ab3eb2ae7bc0b6e190083875294130abde6fb7502f88292948d52db72d695808 -MD5 07e146b8e9dd53461fb1bf93eda58ce2 plextor-tool-0.5.0.ebuild 1145 -RMD160 31de1580a40aacbeed9b206b09bae6702b760285 plextor-tool-0.5.0.ebuild 1145 -SHA256 ab3eb2ae7bc0b6e190083875294130abde6fb7502f88292948d52db72d695808 plextor-tool-0.5.0.ebuild 1145 -MISC ChangeLog 366 RMD160 31067ef3c86f9260a5de44b731a66e980d41a3a5 SHA1 18b72f587de446e5b0e887d0fab8110889da9fda SHA256 33c99857e6ea2e38f36b67faa1ccec97e24a2c6de04a44fcfede0ad1903b5e54 -MD5 c68a403153a0a52ee0b6efe585af77ce ChangeLog 366 -RMD160 31067ef3c86f9260a5de44b731a66e980d41a3a5 ChangeLog 366 -SHA256 33c99857e6ea2e38f36b67faa1ccec97e24a2c6de04a44fcfede0ad1903b5e54 ChangeLog 366 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX plextor-tool-0.5.0-build.patch 2171 RMD160 a1390e2af02794d262a206b67655551228ea445e SHA1 779b4092b575dad4e49e86a01525e198d3ebf8b4 SHA256 531342529545d098ede6813bd376fce8d87db77d10436a90bc0c84acbcc332d1 +MD5 28d9eaf0687aa48ad8d8f0068265afc1 files/plextor-tool-0.5.0-build.patch 2171 +RMD160 a1390e2af02794d262a206b67655551228ea445e files/plextor-tool-0.5.0-build.patch 2171 +SHA256 531342529545d098ede6813bd376fce8d87db77d10436a90bc0c84acbcc332d1 files/plextor-tool-0.5.0-build.patch 2171 +DIST plextor-tool-0.5.0.src.tar.bz2 51594 RMD160 041e1362bf3f0c86e020e2cd7766d29740a04bdc SHA1 f870943588e45d9525a0782497e75e0855c61a95 SHA256 a62787eb2a1f311b66a467777aa864a1e478a649895ba2708f8f46e85e5bd20a +EBUILD plextor-tool-0.5.0.ebuild 1143 RMD160 cf2e0b32dc3ebdcbfae04f4e5108811dd3da68cd SHA1 609e85a465020386201a65b36d81cee60844f71a SHA256 debea1cafbe81354d511ec8e80f183ca92a70f836274108c253f0d962e0ff3d5 +MD5 f46bb4a3cfe25c247591baa08028dccb plextor-tool-0.5.0.ebuild 1143 +RMD160 cf2e0b32dc3ebdcbfae04f4e5108811dd3da68cd plextor-tool-0.5.0.ebuild 1143 +SHA256 debea1cafbe81354d511ec8e80f183ca92a70f836274108c253f0d962e0ff3d5 plextor-tool-0.5.0.ebuild 1143 +MISC ChangeLog 529 RMD160 1ed08e06bc8dd4a775e321ddcbb7d6e7e41a6caa SHA1 c61bd2a9d09c296047a5c4d757c887db465fc4bb SHA256 f5407fa408453da0661d702cdd05878b227a9d74982630aa8d31e6513bb46bc6 +MD5 dc2a6a87101e2c5b46f843c1ef954748 ChangeLog 529 +RMD160 1ed08e06bc8dd4a775e321ddcbb7d6e7e41a6caa ChangeLog 529 +SHA256 f5407fa408453da0661d702cdd05878b227a9d74982630aa8d31e6513bb46bc6 ChangeLog 529 MISC metadata.xml 347 RMD160 48eed9e281b9e7dedcac7e08f144d94d0dcd2193 SHA1 28cfa8b1727fedb3e8e09b82763bb30e09d4b809 SHA256 481cdeb1b70302552e308421f8d7702c29a56af4bc52b4ef5446033475aedc85 MD5 8d56374b6008ddd8e01580b979272eed metadata.xml 347 RMD160 48eed9e281b9e7dedcac7e08f144d94d0dcd2193 metadata.xml 347 SHA256 481cdeb1b70302552e308421f8d7702c29a56af4bc52b4ef5446033475aedc85 metadata.xml 347 -MD5 314eb67b0d18075f122152b83e947bec files/digest-plextor-tool-0.5.0 74 -RMD160 4a4ac9f2d5e32bb26631e941042c53616394dc4b files/digest-plextor-tool-0.5.0 74 -SHA256 e54f080e8b16bf4923f08fcbf56f3245a61ef00fa4865fbeff1967b5f454a686 files/digest-plextor-tool-0.5.0 74 +MD5 d581cd12397d2b1bc9ab744cc35bb254 files/digest-plextor-tool-0.5.0 268 +RMD160 a425e1b4f2cfcaaae769faa838e4b5370be93285 files/digest-plextor-tool-0.5.0 268 +SHA256 306bd163307ebcb893a48911e2ab38b4da5a19cb974ab42991882ba2ea8f9948 files/digest-plextor-tool-0.5.0 268 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFubur8bi6rjpTunYRAjNYAJ9QQjirxdd8Vc4eaF5VHwZmeZWFwQCeKCU/ +qELG5w9zI3TLuZekw9uo11k= +=TLaX +-----END PGP SIGNATURE----- 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="$(