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)

14 files changed, 100 insertions, 93 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>
diff --git a/x11-misc/bbtime/ChangeLog b/x11-misc/bbtime/ChangeLog
index 3cefd956a7cf..0d1035a8787f 100644
--- a/x11-misc/bbtime/ChangeLog
+++ b/x11-misc/bbtime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/bbtime
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbtime/ChangeLog,v 1.6 2004/10/02 15:46:29 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbtime/ChangeLog,v 1.7 2005/01/18 15:47:08 ka0ttic Exp $
+
+  18 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  bbtime-0.1.5.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.
 
   14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> bbtime-0.1.5.ebuild:
   Removed S=, added IUSE=
diff --git a/x11-misc/bbtime/Manifest b/x11-misc/bbtime/Manifest
index 13023819fcd5..12342fdfd9e8 100644
--- a/x11-misc/bbtime/Manifest
+++ b/x11-misc/bbtime/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c202071378c6f1101053d7b60e8bfe9d ChangeLog 650
-MD5 4c1b3815d31ff66515086924043e38b2 bbtime-0.1.5.ebuild 648
-MD5 60ce01169d2eeaaefb45298e0dea139b metadata.xml 236
+MD5 348f39d4c0366ca8d1e962bdd1fb0eda bbtime-0.1.5.ebuild 786
+MD5 7b8e265cd153b709617771e9e92f0351 ChangeLog 890
+MD5 b84017a7d1e8bbe79ae603b9791dac72 metadata.xml 321
 MD5 5d8285de3056fb8c3952192c0a60b858 files/digest-bbtime-0.1.5 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXs1cI1lqEGTUzyQRAhuUAKCYS9WncGhDT2zB31vW2rF5bGQfOgCg1vJN
-urbAYxT240DU4FTHhxt0ROk=
-=7T1I
------END PGP SIGNATURE-----
diff --git a/x11-misc/bbtime/bbtime-0.1.5.ebuild b/x11-misc/bbtime/bbtime-0.1.5.ebuild
index 715328e8d3f9..176fce2b32d9 100644
--- a/x11-misc/bbtime/bbtime-0.1.5.ebuild
+++ b/x11-misc/bbtime/bbtime-0.1.5.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/bbtime/bbtime-0.1.5.ebuild,v 1.5 2004/06/24 22:14:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbtime/bbtime-0.1.5.ebuild,v 1.6 2005/01/18 15:47:08 ka0ttic Exp $
 
-IUSE=""
 DESCRIPTION="blackbox time watcher"
-SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
 HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbsload"
+SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 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 NEWS 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/bbtime/metadata.xml b/x11-misc/bbtime/metadata.xml
index 6648d4cb149f..02bc53e55df1 100644
--- a/x11-misc/bbtime/metadata.xml
+++ b/x11-misc/bbtime/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 time monitor for Blackbox.
-  </longdescription>
+	<herd>commonbox</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
+	<longdescription>A time monitor for Blackbox.</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/bbweather/ChangeLog b/x11-misc/bbweather/ChangeLog
index ba635e9e9aa9..976c3e5e5cd4 100644
--- a/x11-misc/bbweather/ChangeLog
+++ b/x11-misc/bbweather/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/bbweather
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/ChangeLog,v 1.16 2005/01/18 13:04:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/ChangeLog,v 1.17 2005/01/18 15:46:14 ka0ttic Exp $
+
+  18 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> bbweather-0.5.ebuild,
+  bbweather-0.6.2.ebuild, bbweather-0.6.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.
 
 *bbweather-0.6.2 (18 Jan 2005)
 
diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest
index eee41d8b706b..a5a2ce7a7df4 100644
--- a/x11-misc/bbweather/Manifest
+++ b/x11-misc/bbweather/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fd0b2853d164fca01bb85fdb027be7fd bbweather-0.6.ebuild 688
-MD5 90e5d23ac9659588a5f30639cea03d13 bbweather-0.5.ebuild 689
-MD5 f29f781d82dafddb6140379af32aae8f bbweather-0.6.2.ebuild 717
-MD5 bfaccf33461cc4d2b80d2d0afe351fcc ChangeLog 2092
+MD5 e71b0837fd869b7f8eb46e712bc323fe bbweather-0.6.ebuild 867
+MD5 57069e2a9c5b49e52a32bf2850e81c83 bbweather-0.5.ebuild 869
+MD5 cb25518efdc036f99a180e47f3f2cf89 bbweather-0.6.2.ebuild 898
+MD5 5a3e27fdd1eae9be6146afca97fea7e1 ChangeLog 2365
 MD5 3a6513acf184afb395d3ab0538655fa4 metadata.xml 326
 MD5 f50a3c6e984bae7de34913d1008e9c94 files/digest-bbweather-0.5 65
 MD5 8a91d26f53d2a72eec9fc9c7390cd9ea files/digest-bbweather-0.6 65
 MD5 b8e54bde91d64d409470a0dd0aa43dc1 files/digest-bbweather-0.6.2 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB7QlLEZCkKN40op4RAnCqAJ9f/cffw6rZjlWQFgIrsp94B+yduwCgtAsE
-rA9XUAePWjzyO8VGKomDE8E=
-=3nTj
------END PGP SIGNATURE-----
diff --git a/x11-misc/bbweather/bbweather-0.5.ebuild b/x11-misc/bbweather/bbweather-0.5.ebuild
index 1064379a9db0..b3a3da63597e 100644
--- a/x11-misc/bbweather/bbweather-0.5.ebuild
+++ b/x11-misc/bbweather/bbweather-0.5.ebuild
@@ -1,6 +1,6 @@
-# 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/bbweather/bbweather-0.5.ebuild,v 1.10 2004/06/24 22:14:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.5.ebuild,v 1.11 2005/01/18 15:46:14 ka0ttic Exp $
 
 IUSE=""
 DESCRIPTION="blackbox weather monitor"
@@ -21,4 +21,9 @@ src_install () {
 	rm -rf ${D}/usr/share/doc
 	dodoc README COPYING AUTHORS INSTALL ChangeLog NEWS TODO data/README.bbweather
 	dohtml -r doc
+
+	# 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/bbweather/bbweather-0.6.2.ebuild b/x11-misc/bbweather/bbweather-0.6.2.ebuild
index 6daddd6b61a7..3a755853063e 100644
--- a/x11-misc/bbweather/bbweather-0.6.2.ebuild
+++ b/x11-misc/bbweather/bbweather-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.2.ebuild,v 1.1 2005/01/18 13:04:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.2.ebuild,v 1.2 2005/01/18 15:46:14 ka0ttic Exp $
 
 DESCRIPTION="blackbox weather monitor"
 HOMEPAGE="http://www.netmeister.org/apps/bbweather/"
@@ -20,4 +20,10 @@ src_install () {
 	rm -rf ${D}/usr/share/doc
 	dodoc README COPYING AUTHORS INSTALL ChangeLog NEWS TODO data/README.bbweather
 	dohtml -r doc
+
+	# 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/bbweather/bbweather-0.6.ebuild b/x11-misc/bbweather/bbweather-0.6.ebuild
index 3df8cd788fd1..6ca6e26b9a87 100644
--- a/x11-misc/bbweather/bbweather-0.6.ebuild
+++ b/x11-misc/bbweather/bbweather-0.6.ebuild
@@ -1,6 +1,6 @@
-# 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/bbweather/bbweather-0.6.ebuild,v 1.9 2004/06/24 22:14:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.ebuild,v 1.10 2005/01/18 15:46:14 ka0ttic Exp $
 
 IUSE=""
 DESCRIPTION="blackbox weather monitor"
@@ -16,9 +16,13 @@ DEPEND="virtual/blackbox
 	>=dev-lang/perl-5.6.1"
 
 src_install () {
-
 	make DESTDIR=${D} install || die
 	rm -rf ${D}/usr/share/doc
 	dodoc README COPYING AUTHORS INSTALL ChangeLog NEWS TODO data/README.bbweather
 	dohtml -r doc
+
+	# 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
 }