Install example bbtoolsrc file in /usr/share/doc/${PF} since a lot of bb* tools provide it; fixes file collision on /usr/share/bbtools/bbtoolsrc.in.

(Portage version: 2.0.51-r13)

5 files changed, 41 insertions, 42 deletions

diff --git a/x11-misc/bbdate/ChangeLog b/x11-misc/bbdate/ChangeLog
index cabe6e2aa93d..92a728f09ede 100644
--- a/x11-misc/bbdate/ChangeLog
+++ b/x11-misc/bbdate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/bbdate
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/ChangeLog,v 1.11 2004/10/02 15:44:43 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/ChangeLog,v 1.12 2005/01/18 15:46:33 ka0ttic Exp $
+
+  18 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  bbdate-0.2.3.ebuild, bbdate-0.2.4.ebuild:
+  Install example bbtoolsrc file in /usr/share/doc/${PF} since a lot of bb*
+  tools provide it; fixes file collision on /usr/share/bbtools/bbtoolsrc.in.
 
   06 Jun 2004; Jason Wever <weeve@gentoo.org> bbdate-0.2.4.ebuild:
   Stable on sparc.
diff --git a/x11-misc/bbdate/Manifest b/x11-misc/bbdate/Manifest
index 0563fb1549df..f46af852c8c7 100644
--- a/x11-misc/bbdate/Manifest
+++ b/x11-misc/bbdate/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f5ab196d5d19714e1b113c79b7e987ac ChangeLog 935
-MD5 b4d59844a0f05c036dc18c5e4acc3b65 bbdate-0.2.3.ebuild 646
-MD5 12da25cf004d21b656b7e4b823b66b7e bbdate-0.2.4.ebuild 646
-MD5 912097436ea0bb234be09f993d872f49 metadata.xml 236
+MD5 15c0bb357cde57b9a34d42e4d710b6da bbdate-0.2.3.ebuild 779
+MD5 55201b0175206e81f14ce1ccd2310596 ChangeLog 1196
+MD5 b3a287707c0c90b5cbc8b1d9f5d86c0b metadata.xml 321
+MD5 1e8c750f0720dc14b4ef45d8260756fc bbdate-0.2.4.ebuild 779
 MD5 49a1de247dbd7485cb382dadbc3dc783 files/digest-bbdate-0.2.3 63
 MD5 f977ccef24f99dd5d0b956db746e6e26 files/digest-bbdate-0.2.4 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXszyI1lqEGTUzyQRAt9DAKDA9A2opoI3YXLTF9IkpkjEiFb5sACgmsMm
-VbdRWQfWoCzp5/YvJDRB/HY=
-=NdAL
------END PGP SIGNATURE-----
diff --git a/x11-misc/bbdate/bbdate-0.2.3.ebuild b/x11-misc/bbdate/bbdate-0.2.3.ebuild
index 97c3a9435cfe..565dda0a4436 100644
--- a/x11-misc/bbdate/bbdate-0.2.3.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.3.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.3.ebuild,v 1.6 2004/06/24 22:12:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.3.ebuild,v 1.7 2005/01/18 15:46:33 ka0ttic Exp $
 
-IUSE=""
 DESCRIPTION="blackbox date display"
-SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
 HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml"
+SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ppc"
+IUSE=""
 
 DEPEND="virtual/blackbox"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog NEWS TODO data/README.bbsload
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog TODO
+
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv ${D}/usr/share/bbtools/bbtoolsrc.in \
+		${D}/usr/share/doc/${PF}/bbtoolsrc.example
 }
diff --git a/x11-misc/bbdate/bbdate-0.2.4.ebuild b/x11-misc/bbdate/bbdate-0.2.4.ebuild
index 512fe1afc5ff..41c98142933d 100644
--- a/x11-misc/bbdate/bbdate-0.2.4.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.4.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.4.ebuild,v 1.7 2004/06/24 22:12:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.4.ebuild,v 1.8 2005/01/18 15:46:33 ka0ttic Exp $
 
-IUSE=""
 DESCRIPTION="blackbox date display"
-SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
 HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml"
+SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ppc"
+IUSE=""
 
 DEPEND="virtual/blackbox"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog NEWS TODO data/README.bbsload
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog TODO
+
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv ${D}/usr/share/bbtools/bbtoolsrc.in \
+		${D}/usr/share/doc/${PF}/bbtoolsrc.example
 }
diff --git a/x11-misc/bbdate/metadata.xml b/x11-misc/bbdate/metadata.xml
index 3f38ea8294b8..a6384db8d15d 100644
--- a/x11-misc/bbdate/metadata.xml
+++ b/x11-misc/bbdate/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>commonbox</herd>
-  <longdescription>
-  A data display for Blackbox.
-  </longdescription>
+	<herd>commonbox</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
+	<longdescription>A data display for Blackbox.</longdescription>
 </pkgmetadata>