revert

(Portage version: 2.1.1_rc1-r3)
 (Signed Manifest commit)

4 files changed, 7 insertions, 171 deletions

diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 84409144d846..9060442cc6b0 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -45,27 +45,19 @@ AUX man-1.6d-fbsd.patch 308 RMD160 e9dcf44d97d582c52230c00a8a085ac6a4f22c40 SHA1
 MD5 44319e5238442e8272f6ab2aecccbb33 files/man-1.6d-fbsd.patch 308
 RMD160 e9dcf44d97d582c52230c00a8a085ac6a4f22c40 files/man-1.6d-fbsd.patch 308
 SHA256 be33e9fbaa7d22cf7fb44eae65504ca115a779ef34e15191d396ec68cb2f2e00 files/man-1.6d-fbsd.patch 308
-AUX man-1.6d-groff.patch 665 RMD160 82e62455bf11f67ff3de1aeec2cbebde96bd0e91 SHA1 774a26d2410963736991f2298b75188e2eb7b017 SHA256 71f669c3f881e524340fb3cbc6d26682c7af263e60c418ad34de4941beb8f803
-MD5 438dd03df54d19e07a6414df09bd3063 files/man-1.6d-groff.patch 665
-RMD160 82e62455bf11f67ff3de1aeec2cbebde96bd0e91 files/man-1.6d-groff.patch 665
-SHA256 71f669c3f881e524340fb3cbc6d26682c7af263e60c418ad34de4941beb8f803 files/man-1.6d-groff.patch 665
 AUX man-1.6d-headers.patch 929 RMD160 b56a2858bb075d8d4025791c801909fec89358de SHA1 6af23e84ab0436f96a566ef1c59841661e088722 SHA256 113670cdad5c09f51d3981442a271cbf449b8d737ded3ff63c382b1fed37d687
 MD5 f3188dbe359f6d1e72d97961ae3025fd files/man-1.6d-headers.patch 929
 RMD160 b56a2858bb075d8d4025791c801909fec89358de files/man-1.6d-headers.patch 929
 SHA256 113670cdad5c09f51d3981442a271cbf449b8d737ded3ff63c382b1fed37d687 files/man-1.6d-headers.patch 929
 DIST man-1.6d.tar.gz 270140 RMD160 2c476a735c211acbb478d604b73a1becb54cb87b SHA1 f83aecdcd922f0cf3515665b8e1e0e2514c99286 SHA256 a6d03bdabe16542a5a51471b5d8e7eaa50ad782577c7b31d9c478382097cf4eb
-EBUILD man-1.6d-r1.ebuild 3215 RMD160 241956b8c62aa6e21074888659d950ab280fba68 SHA1 e1df6b82536350a1d9635f2a03da80391ecba315 SHA256 989dd564143367cff9c58d48c5b776a6882c417138c4d22a5bfd5a9215f55fef
-MD5 b6416c245ca682988afbfcca999d3d44 man-1.6d-r1.ebuild 3215
-RMD160 241956b8c62aa6e21074888659d950ab280fba68 man-1.6d-r1.ebuild 3215
-SHA256 989dd564143367cff9c58d48c5b776a6882c417138c4d22a5bfd5a9215f55fef man-1.6d-r1.ebuild 3215
 EBUILD man-1.6d.ebuild 3257 RMD160 140751f83e82082e893a57e04591e61c9911c462 SHA1 65fecb054ce281ae10f2662e9d32fb61b9f5aefc SHA256 3ac45f074fd45fe3b3a93781cdd224736cecf62267830ec172649a550c16e0af
 MD5 c1086e6f6b20e2c1e9239c8115ff035e man-1.6d.ebuild 3257
 RMD160 140751f83e82082e893a57e04591e61c9911c462 man-1.6d.ebuild 3257
 SHA256 3ac45f074fd45fe3b3a93781cdd224736cecf62267830ec172649a550c16e0af man-1.6d.ebuild 3257
-MISC ChangeLog 14664 RMD160 191c9eafe542a60849d8276c53b65af0b7ff7665 SHA1 c998c5637b997a0f4ae4800d77b2f973f06131b1 SHA256 06e916d70e400ae7ef4244a61cb1466bb16718e2938d21177072a4e4b35e653a
-MD5 1cba5596ad4217d5ff54e9c5915a7dbf ChangeLog 14664
-RMD160 191c9eafe542a60849d8276c53b65af0b7ff7665 ChangeLog 14664
-SHA256 06e916d70e400ae7ef4244a61cb1466bb16718e2938d21177072a4e4b35e653a ChangeLog 14664
+MISC ChangeLog 14458 RMD160 f9600dcfd5615585f6ab4e3e5be991d975aef716 SHA1 9e43066cf497daba7f6d7b49974fed03d3a06763 SHA256 8fa398525e953baacfd17661d4bcb23f8c778705e3a6cdb68888fde0622a3400
+MD5 f5bd15997fb9e674238e940ac14da7a9 ChangeLog 14458
+RMD160 f9600dcfd5615585f6ab4e3e5be991d975aef716 ChangeLog 14458
+SHA256 8fa398525e953baacfd17661d4bcb23f8c778705e3a6cdb68888fde0622a3400 ChangeLog 14458
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -73,13 +65,10 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 213003d588ce0a364038ed043cde8807 files/digest-man-1.6d 226
 RMD160 7f3d633eee73d7d6b6a5bca47f8579694428626a files/digest-man-1.6d 226
 SHA256 3c06b90149690c7de5586cf6a94dd561580b511eb40d33533aa5e9460a42cb47 files/digest-man-1.6d 226
-MD5 213003d588ce0a364038ed043cde8807 files/digest-man-1.6d-r1 226
-RMD160 7f3d633eee73d7d6b6a5bca47f8579694428626a files/digest-man-1.6d-r1 226
-SHA256 3c06b90149690c7de5586cf6a94dd561580b511eb40d33533aa5e9460a42cb47 files/digest-man-1.6d-r1 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/K1NamhnQswr0vIRArk7AJsGJtX9SMEb1JxygEwgyivlLSKAzgCfQF31
-+qWaPjqOAKo0AUsesAnx4vM=
-=LK9M
+iD8DBQFE/K33amhnQswr0vIRAjMhAJ9ahtep3YSy4+AvRIBLgf5m0IJHNQCgoMmn
+5+i4I41Ya0cLjugb3CmaxTE=
+=QUeZ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/digest-man-1.6d-r1 b/sys-apps/man/files/digest-man-1.6d-r1
deleted file mode 100644
index 8d7dd63c72eb..000000000000
--- a/sys-apps/man/files/digest-man-1.6d-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36d3f65bcc10f0754a3234e00d92ad6d man-1.6d.tar.gz 270140
-RMD160 2c476a735c211acbb478d604b73a1becb54cb87b man-1.6d.tar.gz 270140
-SHA256 a6d03bdabe16542a5a51471b5d8e7eaa50ad782577c7b31d9c478382097cf4eb man-1.6d.tar.gz 270140
diff --git a/sys-apps/man/files/man-1.6d-groff.patch b/sys-apps/man/files/man-1.6d-groff.patch
deleted file mode 100644
index 822b6f012384..000000000000
--- a/sys-apps/man/files/man-1.6d-groff.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Don't force output encoding, let groff do the detectiong
-
-http://bugs.gentoo.org/146315
-
---- man-1.6d/configure
-+++ man-1.6d/configure
-@@ -473,9 +473,9 @@
-   then
-     if test $Fnroff = "missing"
-     then
--      nroff="nroff -Tlatin1 -mandoc"
-+      nroff="nroff -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -mandoc"
-     fi
-     troff="troff -mandoc"
-     echo "Warning: could not find groff"
-@@ -484,7 +484,7 @@
-     then
-       nroff="$Fgroff -Tlatin1 -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -mandoc"
-     fi
-     troff="$Fgroff -Tps -mandoc"
-     jnroff="$Fgroff -Tnippon -mandocj"
-
diff --git a/sys-apps/man/man-1.6d-r1.ebuild b/sys-apps/man/man-1.6d-r1.ebuild
deleted file mode 100644
index afcb95ff21c8..000000000000
--- a/sys-apps/man/man-1.6d-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6d-r1.ebuild,v 1.1 2006/09/04 22:48:37 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Standard commands to read man pages"
-HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
-SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-DEPEND=">=sys-apps/groff-1.19
-	!sys-apps/man-db"
-PROVIDE="virtual/man"
-
-pkg_setup() {
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We love to cross-compile
-	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
-
-	# Fix search order in man.conf so that system installed manpages
-	# will be found first ...
-	epatch "${FILESDIR}"/man-1.5p-search-order.patch
-
-	epatch "${FILESDIR}"/man-1.6d-groff.patch #146315
-
-	# makewhatis traverses manpages twice, as default manpath
-	# contains two directories that are symlinked together
-	epatch "${FILESDIR}"/man-1.5p-defmanpath-symlinks.patch
-
-	# makewhatis should get section info from config, not hardcode it #86863
-	epatch "${FILESDIR}"/man-1.6a-makewhatis-config.patch
-
-	# add more sections to default search path
-	epatch "${FILESDIR}"/man-1.6b-more-sections.patch
-
-	# cut out symlinked paths #90186
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-
-	# Fedora patches
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-
-	# include more headers
-	epatch "${FILESDIR}"/man-1.6d-headers.patch
-
-	# use non-lazy binds for man
-	epatch "${FILESDIR}"/man-1.6b-build.patch
-
-	# Fixes compilation in FreeBSD wrt #138123
-	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
-
-	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
-}
-
-src_compile() {
-	tc-export CC BUILD_CC
-
-	local mylang=
-	if use nls ; then
-		if [[ -z ${LINGUAS} ]] ; then
-			mylang="all"
-		else
-			mylang="${LINGUAS// /,}"
-		fi
-	else
-		mylang="none"
-	fi
-	./configure \
-		-confdir=/etc \
-		+sgid +fhs \
-		+lang ${mylang} \
-		|| die "configure failed"
-
-	export BINDNOW_FLAGS=$(bindnow-flags)
-	emake || die "emake failed"
-}
-
-src_install() {
-	make PREFIX="${D}" install || die "make install failed"
-	dosym man /usr/bin/manpath
-
-	dodoc LSM README* TODO
-
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/makewhatis.cron makewhatis
-
-	keepdir /var/cache/man
-	diropts -m0775 -g man
-	local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-)
-	for x in ${mansects//:/ } ; do
-		keepdir /var/cache/man/cat${x}
-	done
-}
-
-pkg_postinst() {
-	einfo "Forcing sane permissions onto ${ROOT}var/cache/man (Bug #40322)"
-	chown -R root:man "${ROOT}"/var/cache/man
-	chmod -R g+w "${ROOT}"/var/cache/man
-	[[ -e ${ROOT}/var/cache/man/whatis ]] \
-		&& chown root:0 "${ROOT}"/var/cache/man/whatis
-
-	echo
-
-	local files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
-	if [[ ${files/$'\n'} != ${files} ]] ; then
-		ewarn "You have multiple makewhatis cron files installed."
-		ewarn "You might want to delete all but one of these:"
-		ewarn ${files}
-	fi
-}