Remove broken 1.7.1.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 5 insertions, 420 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 8252dcaa0dc0..8ec049ce58e0 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.7 2010/05/28 20:27:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.8 2010/05/28 20:30:31 robbat2 Exp $
+
+  28 May 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.1.ebuild:
+  Remove broken 1.7.1.
 
 *git-1.7.1-r1 (28 May 2010)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 41b3c1eaf81b..ae86bd45d608 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -121,7 +121,6 @@ EBUILD git-1.7.0.3.ebuild 11286 RMD160 ec0d03c0cabbc8404f477cec651c642114fe19bb
 EBUILD git-1.7.0.4.ebuild 11286 RMD160 06b16788b54bcfee5c8219817b016b6a45aacd45 SHA1 2adfba0b08d51f7fa0a5740dd35a48e9f23f8d41 SHA256 03a74571a6123a38dc789cece8d4513a7cb9a153c033ced71f8f431421e78552
 EBUILD git-1.7.0.ebuild 11284 RMD160 53c1bbdc72ac4f8950221d17534444cd906305f2 SHA1 276f6355d48e56d9ee12d195d9be169fee36a84c SHA256 15d4292f13126491032cc1aca9766b773bf7bbbc0f9b37274c1771663f50e1a8
 EBUILD git-1.7.1-r1.ebuild 11418 RMD160 d5faaac1450404f6f5ab1da014285d268a74f783 SHA1 c453096de1f052b8b576fbea42f4f0c86bc073de SHA256 b7f06a62a02abfbe49a7000d0b9effda558f47a887578c1562d7fd446f1cd6f4
-EBUILD git-1.7.1.ebuild 11284 RMD160 3c7275057ec19dc51c46c71e3bf0bb8d2d8bfac0 SHA1 ae34f1a71692dd010e76cafd4e8cf00958fa7fc4 SHA256 cb16b632b7c4703ca72b076e3e9d13d49debb4f96c45ed905bbe1b939d651988
 EBUILD git-9999.ebuild 11276 RMD160 0621eed66ee38cef41b541f279d07f893cd67e92 SHA1 3048e20973fe7b20b67bf61646f2a8c17677355c SHA256 4a8cd3861eed616cfcd96096d2ad817c08b36c52f3aaa9fa655f11bd9f933012
-MISC ChangeLog 64501 RMD160 53c6e86fb9ece3a1a0f1a6037e3934f7a3b0fae6 SHA1 4af4e1754b8b969a87bea98e5208f997316e51a3 SHA256 814ec2f1959b44840b1122f008d0eeeffe647bfb2c504d23613d60f435d64f43
+MISC ChangeLog 64597 RMD160 32cda1e41a34fa809061bae5a8933060032352df SHA1 3d91272291e8e440aca442f4f4d03e5d2dfe2d61 SHA256 3fcfd7e11339984f2a737b91d43211ca32fe3dd69446b6d924d9117fe158c534
 MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007
diff --git a/dev-vcs/git/git-1.7.1.ebuild b/dev-vcs/git/git-1.7.1.ebuild
deleted file mode 100644
index e5dee4ecc2dd..000000000000
--- a/dev-vcs/git/git-1.7.1.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1.ebuild,v 1.1 2010/05/01 08:53:10 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-			mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-			doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-	SRC_URI=""
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	!blksha1? ( dev-libs/openssl )
-	sys-libs/zlib
-	perl?   ( dev-lang/perl )
-	tk?     ( dev-lang/tk )
-	curl?   (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	gtk?
-	(
-		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-	)"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	app-arch/cpio
-	doc?    (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-	)"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		doc?    (
-			app-text/xmlto
-		)"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use perl ; then
-		use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-		use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-		use subversion && ewarn "git-svn needs USE=perl, it won't work"
-	fi
-	if use webdav && ! use curl ; then
-		ewarn "USE=webdav needs USE=curl. Ignoring"
-	fi
-	if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/subversion dso ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts="${myopts} BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-	fi
-
-	use iconv \
-		|| myopts="${myopts} NO_ICONV=YesPlease"
-	use tk \
-		|| myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl \
-		&& myopts="${myopts} INSTALLDIRS=vendor" \
-		|| myopts="${myopts} NO_PERL=YesPlease"
-	use threads \
-		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion \
-		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts="${myopts} ASCIIDOC8=YesPlease"
-	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts="${myopts} NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-	if [ "${PV}" != "9999" ]; then
-		unpack ${MY_P}.tar.bz2
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-		cd "${S}"
-	else
-		git_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# Noperl is being merged to upstream as of 2009/04/05
-	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-	# GetOpt-Long v2.38 is strict
-	# Merged in 1.6.3 final 2009/05/07
-	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-	# JS install fixup
-	epatch "${FILESDIR}"/git-1.7.1-always-install-js.patch
-
-	sed -i \
-		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
-		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
-		Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-}
-
-git_emake() {
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix=/usr \
-		htmldir=/usr/share/doc/${PF}/html \
-		"$@"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el \
-			|| die "emacs modules failed"
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ "$PV" == "9999" ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	doman man?/*.[157] Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-
-	if use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	dobin contrib/fast-import/git-p4
-	dodoc contrib/fast-import/git-p4.txt
-	newbin contrib/fast-import/import-tars.perl import-tars
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# svnimport - use git-svn
-	# p4import - excluded because fast-import has a better one
-	# examples - these are stuff that is not used in Git anymore actually
-	# patches - stuff the Git guys made to go upstream to other places
-	for i in continuous fast-import hg-to-git \
-		hooks remotes2config.sh stats \
-		workdir convert-objects blameview ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${D}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		dodir /usr/share/${PN}/gitweb
-		insinto /usr/share/${PN}/gitweb
-		doins "${S}"/gitweb/gitweb.cgi
-		doins "${S}"/gitweb/gitweb.css
-		js=gitweb.js
-		[ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-		doins "${S}"/gitweb/${js}
-		doins "${S}"/gitweb/git-{favicon,logo}.png
-
-		# Make sure it can run
-		fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${D}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	fi
-	if ! use subversion ; then
-		rm -f "${D}"/usr/libexec/git-core/git-svn \
-			"${D}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-	fixlocalpod
-}
-
-src_test() {
-	local disabled=""
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh"
-	local tests_perl="t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-	cd "${S}"
-	# Now run the tests
-	einfo "Start test run"
-	git_emake \
-		test || die "tests failed"
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-		ewarn "You must build dev-util/subversion with USE=perl"
-		ewarn "to get the full functionality of git-svn!"
-	fi
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}