Fix install path #184600.

Package-Manager: portage-2.1.3_rc6

5 files changed, 103 insertions, 15 deletions

diff --git a/sys-apps/man-pages/ChangeLog b/sys-apps/man-pages/ChangeLog
index 8a93132fc610..a8dcc85c3e02 100644
--- a/sys-apps/man-pages/ChangeLog
+++ b/sys-apps/man-pages/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/man-pages
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.89 2007/07/07 17:34:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.90 2007/07/08 21:07:27 vapier Exp $
+
+*man-pages-2.61-r1 (08 Jul 2007)
+
+  08 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/man-pages-2.61-DESTDIR.patch, +man-pages-2.61-r1.ebuild:
+  Fix install path #184600.
 
 *man-pages-2.61 (07 Jul 2007)
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 2d8a96cdfd95..63226927c1ff 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -5,6 +5,10 @@ AUX man-pages-2.08-updates.patch 351 RMD160 090c1d31d4589fa19f8cb7e287a84f4f18e6
 MD5 078cd80352b7ac508adeda912eba0cc9 files/man-pages-2.08-updates.patch 351
 RMD160 090c1d31d4589fa19f8cb7e287a84f4f18e612e1 files/man-pages-2.08-updates.patch 351
 SHA256 c1302276b420acf3d9447cb3436ee2b70567b92917d7cf912c59f622086d1e37 files/man-pages-2.08-updates.patch 351
+AUX man-pages-2.61-DESTDIR.patch 654 RMD160 78491d2afcf3556b108c376b911ecfa1efa71f93 SHA1 29a998b7b831b034f586f125daae73c1e964fb32 SHA256 b9f37792697a10ac8a0738fd2efcd0bf1b2073e78cef5521c40d5468a994e127
+MD5 d1d1d70ce320b0b8bfffd30b54495d29 files/man-pages-2.61-DESTDIR.patch 654
+RMD160 78491d2afcf3556b108c376b911ecfa1efa71f93 files/man-pages-2.61-DESTDIR.patch 654
+SHA256 b9f37792697a10ac8a0738fd2efcd0bf1b2073e78cef5521c40d5468a994e127 files/man-pages-2.61-DESTDIR.patch 654
 DIST man-pages-2.57.tar.bz2 1800694 RMD160 9b0e2143daac4d03988d31889e8eb74cb96d2c07 SHA1 885877cd3c2cc536db650ed2432cc13f90118382 SHA256 b7e379a1db74976b29a6d0d17e003dbe89b62d3bb0950274ae69154fab50fd2c
 DIST man-pages-2.58.tar.bz2 1804024 RMD160 2d4b769d5d59078fbce093b991ea6290673c589a SHA1 3e3d57592369da56989892c38b01b11418592873 SHA256 0d42db803f7e40b79c4a1f3963d82d9dc5cfec9fb877e367e3d1ccae5ef5232b
 DIST man-pages-2.60.tar.bz2 1804211 RMD160 b77c5927aaec872a7d7a75bea1851b6141d91e9d SHA1 47204e409a52bf4bb9336301fc9178c4ecc6d99e SHA256 df7a55e89c963d55d7367d4f0db59ca71a2d620f1f8158758806399faab23c28
@@ -21,14 +25,14 @@ EBUILD man-pages-2.60.ebuild 1425 RMD160 62c09e142c54bdd6b585bcb839229632f48da1d
 MD5 1adc1c7e448c97f62edbcc3be02c11ac man-pages-2.60.ebuild 1425
 RMD160 62c09e142c54bdd6b585bcb839229632f48da1db man-pages-2.60.ebuild 1425
 SHA256 db04a9db2f7a04e536da51e5c1eb84de078b6afac82d52bfe5ebfb1e21100fdc man-pages-2.60.ebuild 1425
-EBUILD man-pages-2.61.ebuild 1438 RMD160 b1c262b304c26a054755dc4a053f9e79eb848e6e SHA1 7b3d5fff48db2c9f1f560980f68fe3907f56baed SHA256 e427a018a702784157639562334635679667f50d8dbf3bb1645b432481f59e37
-MD5 0ed75702131a6b248addaccee50ba092 man-pages-2.61.ebuild 1438
-RMD160 b1c262b304c26a054755dc4a053f9e79eb848e6e man-pages-2.61.ebuild 1438
-SHA256 e427a018a702784157639562334635679667f50d8dbf3bb1645b432481f59e37 man-pages-2.61.ebuild 1438
-MISC ChangeLog 11230 RMD160 d8e36ebb4d2ab4e19e5898d33249bb33d73ac2c0 SHA1 e1fe7db3e8e8b4a5133a5a8f0ea4d0481a73b692 SHA256 0213db79edf89924649be81f3eca0393865c5b4326e55e27adcb02e1881e4e32
-MD5 231578c3daca6c16e91c3ecd7f6eb003 ChangeLog 11230
-RMD160 d8e36ebb4d2ab4e19e5898d33249bb33d73ac2c0 ChangeLog 11230
-SHA256 0213db79edf89924649be81f3eca0393865c5b4326e55e27adcb02e1881e4e32 ChangeLog 11230
+EBUILD man-pages-2.61-r1.ebuild 1489 RMD160 7bff63f55fb937850a806102c8cf866f67cf994a SHA1 df51169eec8bdea88b444ad1c20440d8f8a31a57 SHA256 f4a4e87dbec63e6000d3913dd9b5e7fce197bb61108b910ad708d19dad3c488a
+MD5 0a7ccb232c3fea026f20140f083ba441 man-pages-2.61-r1.ebuild 1489
+RMD160 7bff63f55fb937850a806102c8cf866f67cf994a man-pages-2.61-r1.ebuild 1489
+SHA256 f4a4e87dbec63e6000d3913dd9b5e7fce197bb61108b910ad708d19dad3c488a man-pages-2.61-r1.ebuild 1489
+MISC ChangeLog 11409 RMD160 07436253184550c5834a906288e3f5dc3b58a409 SHA1 160e7818ca9bc98fb5fe32d3778d090e1e6b1de4 SHA256 09ea4616b7c0a677054e87572347787f26a526e34d8c92422c88b81bde6d91c8
+MD5 e14c1d9e1a14870ac9f73236441a15d5 ChangeLog 11409
+RMD160 07436253184550c5834a906288e3f5dc3b58a409 ChangeLog 11409
+SHA256 09ea4616b7c0a677054e87572347787f26a526e34d8c92422c88b81bde6d91c8 ChangeLog 11409
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -42,13 +46,13 @@ SHA256 849defa292962bcfbb9bfe90b5c7140cc4b741ea68e71f22a59dc184aa9f931e files/di
 MD5 19ead624274f79a937e0a87dc73bd991 files/digest-man-pages-2.60 250
 RMD160 52b3c4cd00ca06cba446d29ae95d717b876a49ab files/digest-man-pages-2.60 250
 SHA256 f5b3aca08a376df4c7eff2c782c63dd6b69dedc65b3363321ed7ad8eca5a5a4e files/digest-man-pages-2.60 250
-MD5 f2e1339239860a2252abdf08afe7bfc6 files/digest-man-pages-2.61 250
-RMD160 5ac331b8a02bf2abbcfa8f5baa6d5bcda7ff9894 files/digest-man-pages-2.61 250
-SHA256 174f0034cad9991d2b1e06b007688ea143a264099450be55c0bf1f41c723f2e4 files/digest-man-pages-2.61 250
+MD5 f2e1339239860a2252abdf08afe7bfc6 files/digest-man-pages-2.61-r1 250
+RMD160 5ac331b8a02bf2abbcfa8f5baa6d5bcda7ff9894 files/digest-man-pages-2.61-r1 250
+SHA256 174f0034cad9991d2b1e06b007688ea143a264099450be55c0bf1f41c723f2e4 files/digest-man-pages-2.61-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGj89Rp/wUKkr7RBoRAjwHAKDMd8FA+vKvkiec1+KvtEC2Be+eHgCgnsGl
-6CEmi44kU54aq/yHZlv6XOI=
-=RC2s
+iD8DBQFGkVKsp/wUKkr7RBoRAkr1AKCncI9dI05bPIkERJD1y3U+sLoyxACgsLfb
+PJXDV+r79KL6e7UAgy68qe4=
+=AiCb
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man-pages/files/digest-man-pages-2.61-r1 b/sys-apps/man-pages/files/digest-man-pages-2.61-r1
new file mode 100644
index 000000000000..8f18f1a49973
--- /dev/null
+++ b/sys-apps/man-pages/files/digest-man-pages-2.61-r1
@@ -0,0 +1,3 @@
+MD5 aa55d60622c4ce6510b8a064e07464c3 man-pages-2.61.tar.bz2 1832855
+RMD160 b8e037015d598bac17b91d47bf989ef1a58ab79d man-pages-2.61.tar.bz2 1832855
+SHA256 a697fdb5693d58ba55a27e25c2a439651503dcb159d7f2477815eeb406d797f2 man-pages-2.61.tar.bz2 1832855
diff --git a/sys-apps/man-pages/files/man-pages-2.61-DESTDIR.patch b/sys-apps/man-pages/files/man-pages-2.61-DESTDIR.patch
new file mode 100644
index 000000000000..63e5754f9ead
--- /dev/null
+++ b/sys-apps/man-pages/files/man-pages-2.61-DESTDIR.patch
@@ -0,0 +1,25 @@
+--- Makefile
++++ Makefile
+@@ -3,6 +3,7 @@
+ # Do "make install" to copy the pages to their destination.
+ # Do "make gz" or "make bz2" first if you use compressed source pages.
+ 
++DESTDIR=
+ prefix?=/usr
+ MANDIR=$(prefix)/share/man
+ 
+@@ -48,11 +49,11 @@
+ 		done; \
+ 	done; fi
+ 
+-README=$(MANDIR)/man1/README
++README=$(DESTDIR)$(MANDIR)/man1/README
+ install:
+ 	for i in man? man??; do \
+-		install -d -m 755 $(MANDIR)/"$$i"; \
+-		install -m 644 "$$i"/* $(MANDIR)/"$$i"; \
++		install -d -m 755 $(DESTDIR)$(MANDIR)/"$$i" || exit $$?; \
++		install -m 644 "$$i"/* $(DESTDIR)$(MANDIR)/"$$i" || exit $$?; \
+ 	done; \
+ 	rm -f $(README) $(README).gz $(README).bz2
+ 
diff --git a/sys-apps/man-pages/man-pages-2.61-r1.ebuild b/sys-apps/man-pages/man-pages-2.61-r1.ebuild
new file mode 100644
index 000000000000..c2d53aaf7aab
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-2.61-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.61-r1.ebuild,v 1.1 2007/07/08 21:07:27 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="http://www.win.tue.nl/~aeb/linux/man/"
+SRC_URI="mirror://kernel/linux/docs/manpages/${P}.tar.bz2"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="virtual/man"
+PDEPEND="nls? (
+	linguas_cs? ( app-i18n/man-pages-cs )
+	linguas_da? ( app-i18n/man-pages-da )
+	linguas_de? ( app-i18n/man-pages-de )
+	linguas_es? ( app-i18n/man-pages-es )
+	linguas_fr? ( app-i18n/man-pages-fr )
+	linguas_it? ( app-i18n/man-pages-it )
+	linguas_ja? ( app-i18n/man-pages-ja )
+	linguas_nl? ( app-i18n/man-pages-nl )
+	linguas_pl? ( app-i18n/man-pages-pl )
+	linguas_ro? ( app-i18n/man-pages-ro )
+	linguas_ru? ( app-i18n/man-pages-ru )
+	linguas_zh_CN? ( app-i18n/man-pages-zh_CN )
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.08-updates.patch
+	epatch "${FILESDIR}"/${PN}-2.61-DESTDIR.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc man-pages-*.Announce README Changes* HOWTOHELP
+}
+
+pkg_postinst() {
+	einfo "If you don't have a makewhatis cronjob, then you"
+	einfo "should update the whatis database yourself:"
+	einfo " # makewhatis -u"
+}