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, 31 insertions, 21 deletions

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
 }