metadata + clean up compile/install

4 files changed, 52 insertions, 31 deletions

diff --git a/sys-apps/gtkpbbuttons/ChangeLog b/sys-apps/gtkpbbuttons/ChangeLog
index cfb72790f313..758b1c972533 100644
--- a/sys-apps/gtkpbbuttons/ChangeLog
+++ b/sys-apps/gtkpbbuttons/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for sys-apps/gtkpbbuttons
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/ChangeLog,v 1.8 2003/03/15 03:25:49 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/ChangeLog,v 1.9 2003/08/17 21:31:56 vapier Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *gtkpbbuttons-0.5.2 (17 Oct 2002)
 
+  17 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Clean up compile/install to fix incorrect installs and be more Gentooish.
+
   14 Mar 2003; Mark Guertin <gerk@gentoo.org> gtkpbbuttons-0.4.6b.ebuild,
   gtkpbbuttons-0.5.2.ebuild:
   Fixed deps and keywords
diff --git a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
index 6383008d8741..cd7eb2d1939d 100644
--- a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
+++ b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.18 2003/06/23 00:32:02 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.19 2003/08/17 21:31:56 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="gtkpbbuttons is a PPC-only program to monitor special Powerbook/iBook keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="PPC-only program to monitor special Powerbook/iBook keys in Linux"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -amd64 -alpha -arm -hppa -mips -sparc"
-SLOT="0"
+SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ppc"
 
-DEPEND="=x11-libs/gtk+-1.2* media-libs/audiofile sys-apps/pbbuttonsd"
+DEPEND="=x11-libs/gtk+-1.2*
+	media-libs/audiofile
+	>=sys-apps/pbbuttonsd-0.5"
 
 src_compile() {
-	./configure --prefix=/usr || die "sorry, ppc-only package"
-	make || die "sorry, gtkpbbuttons compile failed"
+	econf || die
+	make || die "compile failed"
 }
 
 src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
-		install || die "sorry, failed to install gtkpbbuttons"
-
+	make install DESTDIR=${D} || die
 	dodoc README COPYING
 }
diff --git a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
index 337556a96c57..ad3a38c6f4e9 100644
--- a/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
+++ b/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.8 2003/06/23 00:32:02 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.9 2003/08/17 21:31:56 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="gtkpbbuttons is a PPC-only program to monitor special Powerbook/iBook keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="PPC-only program to monitor special Powerbook/iBook keys in Linux"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc"
-SLOT="0"
+SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ppc"
 
-DEPEND="=x11-libs/gtk+-1.2* media-libs/audiofile >=sys-apps/pbbuttonsd-0.5"
+DEPEND="=x11-libs/gtk+-1.2*
+	media-libs/audiofile
+	>=sys-apps/pbbuttonsd-0.5"
 
 src_compile() {
-	./configure --prefix=/usr || die "sorry, gtkpbbuttons configure failed"
-	make || die "sorry, gtkpbbuttons compile failed"
+	econf || die
+	make || die "compile failed"
 }
 
 src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
-		install || die "sorry, failed to install gtkpbbuttons"
-
+	make install DESTDIR=${D} || die
 	dodoc README COPYING
 }
diff --git a/sys-apps/gtkpbbuttons/metadata.xml b/sys-apps/gtkpbbuttons/metadata.xml
new file mode 100644
index 000000000000..0a8d779998d3
--- /dev/null
+++ b/sys-apps/gtkpbbuttons/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ppc</herd>
+<longdescription>
+PBButtons is a programm suite to support laptop specific functions and make them 
+available again under Linux. Basically it was developed to support the special 
+hotkeys of an Apple iBook, Powerbook or TiBook but since version 0.5 the design 
+has been changed to support all kind of laptop or notebook.
+
+With this programms the keys for the display brightness, the volume of speaker 
+and headphone, the mute key and the eject key will do their job as expected. The 
+daemon also do some power management tasks including low battery warnings, 
+dimming the display if idle, sleep on command, etc.
+
+The main part of PBButtons is the daemon pbbuttonsd which work as a server that 
+do all the work. It runs in background and is preferable started at boot time. 
+Multiple clients could register themselves to get messages about events from the 
+server.
+
+One of the clients is gtkpbbuttons. It displays small GTK popup windows each time 
+a message from the daemon pbbuttonsd appeares.
+</longdescription>
+</pkgmetadata>