Fixed documentation moving (bug #110268)

(Portage version: 2.0.52-r1)

4 files changed, 23 insertions, 16 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index a281e1cdcaef..9ae3cbc9a90d 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.65 2005/10/20 23:22:27 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.66 2005/10/24 19:56:36 mkay Exp $
+
+  24 Oct 2005; <mkay@gentoo.org> bittorrent-4.1.6-r1.ebuild,
+  bittorrent-4.1.6-r2.ebuild:
+  Fixed documentation moving (bug #110268)
 
 *bittorrent-4.1.6-r2 (20 Oct 2005)
 
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 4aea4f516fb9..83eba396be3b 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -3,11 +3,11 @@ MD5 4cd212682be24bfbff707f07b8549f83 bittorrent-3.4.2-r2.ebuild 1930
 MD5 d6f1c6f8065a984e5ebefed06d3fabfd bittorrent-4.0.2.ebuild 1973
 MD5 462e522f275310b5d305c18a6ef57829 bittorrent-4.0.4.ebuild 2045
 MD5 326a6256ced48cc425034755fd3d5c4a bittorrent-4.1.3.ebuild 2168
-MD5 6c942f2d89711fe775a838da6ce4b457 bittorrent-4.1.4.ebuild 2305
+MD5 3772966d56b4ab6595224244bd1d440f bittorrent-4.1.4.ebuild 2312
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 4cc659a077dc3dbf02ad922c9175cb81 bittorrent-4.1.6.ebuild 2305
-MD5 6ab119c930ad668919b114f90b649a94 bittorrent-4.1.6-r1.ebuild 2533
-MD5 6ebefdf591f1aa04943ae861f6cb6108 bittorrent-4.1.6-r2.ebuild 1962
+MD5 385bcadc4fff1bd0d04bb4c8201efb49 bittorrent-4.1.6.ebuild 2312
+MD5 67ca32054849ddc87b2543afeda98d3a bittorrent-4.1.6-r1.ebuild 2580
+MD5 1cac1344cd1e1660fc7414d0bcf6e518 bittorrent-4.1.6-r2.ebuild 2011
 MD5 21ec89d06de83ddcc4cf6d6616355190 files/bittorrent-4.1.0-fix-all.patch 2483
 MD5 139c4a4367e37fcf7dc6bd18515456c2 files/btdownloadgui.desktop 166
 MD5 a94d4e97cceef0143a1a5c8784b6f70c files/bttrack.conf 728
diff --git a/net-p2p/bittorrent/bittorrent-4.1.6-r1.ebuild b/net-p2p/bittorrent/bittorrent-4.1.6-r1.ebuild
index 7d5db7af0101..b2ef06d15f5a 100644
--- a/net-p2p/bittorrent/bittorrent-4.1.6-r1.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.1.6-r1.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/net-p2p/bittorrent/bittorrent-4.1.6-r1.ebuild,v 1.1 2005/10/19 15:57:06 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.6-r1.ebuild,v 1.2 2005/10/24 19:56:36 mkay Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -50,10 +50,12 @@ src_install() {
 	dodir etc
 	cp -pPR /etc/mailcap ${D}/etc/
 
-	rm ${D}/usr/share/doc/${P}/redirdonate.html
-	mv ${D}/usr/share/doc/${MY_P}/* ${D}/usr/share/doc/${P}/
-	rm -fr ${D}/usr/share/doc/${MY_P}
-
+    mv ${D}/usr/share/doc/${P}/{credits-l10n.txt,credits.txt} \
+		${D}/usr/share/doc/${PF}
+	rm -rf ${D}/usr/share/doc/${P}
+	mv ${D}/usr/share/doc/${PF} ${D}/usr/share/doc/${P}
+					
+			
 	MAILCAP_STRING="application/x-bittorrent; /usr/bin/bittorrent '%s'; test=test -n \"\$DISPLAY\""
 
 	if use gtk; then
diff --git a/net-p2p/bittorrent/bittorrent-4.1.6-r2.ebuild b/net-p2p/bittorrent/bittorrent-4.1.6-r2.ebuild
index e530aba25c21..1919c1ff6dea 100644
--- a/net-p2p/bittorrent/bittorrent-4.1.6-r2.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.1.6-r2.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/net-p2p/bittorrent/bittorrent-4.1.6-r2.ebuild,v 1.1 2005/10/20 23:22:27 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.6-r2.ebuild,v 1.2 2005/10/24 19:56:36 mkay Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	dev-python/dnspython"
 PROVIDE="virtual/bittorrent"
 
-DOCS="TRACKERLESS.txt LICENSE.txt"
+DOCS="TRACKERLESS.txt LICENSE.txt public.key"
 PYTHON_MODNAME="BitTorrent"
 
 src_unpack() {
@@ -48,10 +48,11 @@ src_install() {
 	fi
 	dohtml redirdonate.html
 
-	rm ${D}/usr/share/doc/${P}/redirdonate.html
-	mv ${D}/usr/share/doc/${MY_P}/* ${D}/usr/share/doc/${P}/
-	rm -fr ${D}/usr/share/doc/${MY_P}
-
+	mv ${D}/usr/share/doc/${P}/{credits-l10n.txt,credits.txt} \
+		${D}/usr/share/doc/${PF} 
+	rm -rf ${D}/usr/share/doc/${P}
+	mv ${D}/usr/share/doc/${PF} ${D}/usr/share/doc/${P}
+		
 	if use gtk ; then
 		cp ${D}/usr/share/pixmaps/${MY_P}/bittorrent.ico ${D}/usr/share/pixmaps/
 		make_desktop_entry "bittorrent" "BitTorrent" \