git-1.1.6 stable on alpha. Remove ancienct ~arch versions

Package-Manager: portage-2.0.54

9 files changed, 19 insertions, 348 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 0b633f8b26fc..f7da24c74819 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.70 2006/02/13 15:00:48 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.71 2006/02/15 09:15:48 ferdy Exp $
+
+  15 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8a.ebuild,
+  -git-0.99.9n.ebuild, -git-1.0.6.ebuild, git-1.1.6.ebuild:
+  git-1.1.6 stable on alpha. Remove ancienct ~arch versions
 
   13 Feb 2006; Stuart Longland <redhatter@gentoo.org> git-1.1.6.ebuild:
   Added ~mips to git-1.1.6 as per bug #108215.
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index ee65210d7bae..6f91cc305f6e 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,16 +1,20 @@
-MD5 eedb36077db0d32f8923828623e386a2 ChangeLog 10873
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e07686831aa5fc0e20d4c20a26281de8 ChangeLog 11064
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
-MD5 62316f61a79143fdaf1e9f747d1ddf03 files/digest-git-0.99.8a 69
-MD5 ede5785dc3531d89fe224f16c233e8d2 files/digest-git-0.99.9n 64
-MD5 9a11cbe923c58faff7973a8c5c028cd4 files/digest-git-1.0.6 194
 MD5 8623111b91d1c7d14999e96d857384d9 files/digest-git-1.1.6 194
 MD5 b46487fd3358e8a1ed607752045c5fd3 files/digest-git-1.2.0 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
-MD5 d35a0c0793dbfc65191588d2eca405d1 git-0.99.8a.ebuild 2835
-MD5 836fd3f0a31e670e7cdb6350d38f5323 git-0.99.9n.ebuild 3342
-MD5 ad6e42cb0d33b430c8f21c46aaf151a8 git-1.0.6.ebuild 3199
-MD5 a38f1d43c25680af1816028bfe65aa9b git-1.1.6.ebuild 3155
+MD5 2422a58186996fc4ee8e6c315dc00934 git-1.1.6.ebuild 3150
 MD5 831a6c13c1a3fde048e37ec872d90402 git-1.2.0.ebuild 3145
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD8vFdViELBEf1JB0RAlshAJ9jTezMEYiI1Lq1kMBaYsf/6vT/3gCfRJWt
+Hs/5iNbFGnb8Yx+Ch7w0m5g=
+=9W8V
+-----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-0.99.8a b/dev-util/git/files/digest-git-0.99.8a
deleted file mode 100644
index faa2710dff94..000000000000
--- a/dev-util/git/files/digest-git-0.99.8a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bea60a4e5394a3288a5c7d3d15a11c25 git-core-0.99.8a.tar.bz2 366070
diff --git a/dev-util/git/files/digest-git-0.99.9n b/dev-util/git/files/digest-git-0.99.9n
deleted file mode 100644
index caab183643dc..000000000000
--- a/dev-util/git/files/digest-git-0.99.9n
+++ /dev/null
@@ -1 +0,0 @@
-MD5 25feb955eeacaaefe3046958350188a5 git-0.99.9n.tar.bz2 473808
diff --git a/dev-util/git/files/digest-git-1.0.6 b/dev-util/git/files/digest-git-1.0.6
deleted file mode 100644
index ec36e5add655..000000000000
--- a/dev-util/git/files/digest-git-1.0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 733475da5a1260d9805e3b84f15ff5cd git-1.0.6.tar.bz2 475495
-MD5 39ee22936b2372f4fba43f82929a94ac git-html-1.0.5.tar.bz2 201581
-MD5 4e5659f6a3f50e49387bc478479847a9 git-man-1.0.5.tar.bz2 65523
diff --git a/dev-util/git/git-0.99.8a.ebuild b/dev-util/git/git-0.99.8a.ebuild
deleted file mode 100644
index 5224e15a9c34..000000000000
--- a/dev-util/git/git-0.99.8a.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.8a.ebuild,v 1.1 2005/10/05 15:05:04 ferdy Exp $
-
-inherit python
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="http://kernel.org/pub/software/scm/git/${PN}-core-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail"
-S="${WORKDIR}/${PN}-core-${PV}"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		app-text/rcs
-		!app-misc/git
-		doc? ( >=app-text/asciidoc-7.0.1 app-text/xmlto )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		>=dev-lang/python-2.3
-		tcltk? ( dev-lang/tk )
-		curl? ( net-misc/curl )
-		dev-perl/String-ShellQuote
-		gitsendemail? ( dev-perl/Mail-Sendmail )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:" \
-		Makefile
-}
-
-src_compile() {
-	# Use python_version to check for python 2.4.
-	# If the user don't have version 2.4 have then we set WITH_OWN_SUBPROCESS_PY
-	# that makes use of a suplied version of subprocess.py
-	python_version()
-	[[ $PYVER < 2.4 ]] && export WITH_OWN_SUBPROCESS_PY=yes
-
-	if use mozsha1 ; then
-		export MOZILLA_SHA1=yes
-	elif use ppcsha1 ; then
-		export PPC_SHA1=yes
-	fi
-
-	if ! use curl; then
-		export NO_CURL=yes
-		ewarn "git-http-pull will not be built because you are not"
-		ewarn " using the curl use flag"
-	fi
-
-	use gitsendemail && export WITH_SEND_EMAIL=yes
-
-	emake prefix=/usr || die "make failed"
-
-	if use doc ; then
-		sed -i \
-			-e "s:^\(WEBDOC_DEST = \).*$:\1${D}/usr/share/doc/${PF}/html/:g" \
-			${S}/Documentation/Makefile || die "sed failed (Documentation)"
-		emake -C Documentation/ || die "make documentation failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} prefix=/usr install || die "make install failed"
-
-	if use gitsendemail ; then
-		exeinto /usr/bin
-		doexe git-send-email.perl
-	fi
-
-	use tcltk || rm ${D}/usr/bin/gitk
-
-	dodoc README COPYING
-	if use doc ; then
-		doman Documentation/*.1 Documentation/*.7
-		make install-webdoc -C Documentation/
-	fi
-
-	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
-	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Some commands will be renamed before the final 1.0. Use the git"
-	ewarn "wrapper in your scripts to avoid compatibility problems. Check the"
-	ewarn "changes table at:"
-	echo
-	echo "http://dev.gentoo.org/~r3pek/git-new-command-list.txt"
-	echo
-	einfo
-	einfo "If you want to import arch repositories into git, consider using the"
-	einfo "git-archimport command. You should install dev-util/tla before."
-	einfo
-	einfo "If you want to import cvs repositories into git, consider using the"
-	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1"
-	einfo
-}
diff --git a/dev-util/git/git-0.99.9n.ebuild b/dev-util/git/git-0.99.9n.ebuild
deleted file mode 100644
index 16615363de10..000000000000
--- a/dev-util/git/git-0.99.9n.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.9n.ebuild,v 1.1 2005/12/15 09:47:35 ferdy Exp $
-
-inherit python toolchain-funcs eutils
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="http://kernel.org/pub/software/scm/git/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail webdav"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )
-		doc? ( >=app-text/asciidoc-7.0.1 app-text/xmlto )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		>=dev-lang/python-2.3
-		app-text/rcs
-		tcltk? ( dev-lang/tk )
-		dev-perl/String-ShellQuote
-		gitsendemail? ( dev-perl/Mail-Sendmail dev-perl/Email-Valid )"
-
-# 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 mozsha1 ; then
-		myopts="${myopts} MOZILLA_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"
-		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
-	fi
-
-	use gitsendemail && myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
-
-	# Older python versions need own subproccess.py
-	python_version
-	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
-		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
-		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
-		Makefile || die "sed failed"
-
-	exportmakeopts
-}
-
-src_compile() {
-	emake ${MY_MAKEOPTS} prefix=/usr || die "make failed"
-
-	if use doc ; then
-		sed -i \
-			-e "s:^\(WEBDOC_DEST = \).*$:\1${D}/usr/share/doc/${PF}/html/:g" \
-			${S}/Documentation/Makefile || die "sed failed (Documentation)"
-		emake -C Documentation/ || die "make documentation failed"
-	fi
-}
-
-src_install() {
-	make ${MY_MAKEOPTS} DESTDIR=${D} prefix=/usr install || die "make install failed"
-
-	use tcltk || rm ${D}/usr/bin/gitk
-
-	dodoc README COPYING Documentation/SubmittingPatches
-	if use doc ; then
-		doman Documentation/*.1 Documentation/*.7
-		make install-webdoc -C Documentation/
-		dodoc technical/*
-	fi
-
-	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
-	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
-}
-
-src_test() {
-	cd ${S}
-	make ${MY_MAKEOPTS} test || die "tests failed"
-}
-
-pkg_postinst() {
-	# Remove old links. Workarounds a portage bug not removing symlinks
-	${S}/cmd-rename.sh "${ROOT}/usr/bin"
-
-	einfo
-	einfo "If you want to import arch repositories into git, consider using the"
-	einfo "git-archimport command. You should install dev-util/tla before"
-	einfo
-	einfo "If you want to import cvs repositories into git, consider using the"
-	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before"
-	einfo
-	einfo "If you want to import svn repositories into git, consider using the"
-	einfo "git-svnimport command. You should install dev-util/subversion before"
-	einfo
-}
diff --git a/dev-util/git/git-1.0.6.ebuild b/dev-util/git/git-1.0.6.ebuild
deleted file mode 100644
index a43ffc97a562..000000000000
--- a/dev-util/git/git-1.0.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.0.6.ebuild,v 1.1 2005/12/28 13:22:05 ferdy Exp $
-
-inherit python toolchain-funcs eutils
-
-DOC_VER="1.0.5"
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="http://kernel.org/pub/software/scm/git/${P}.tar.bz2
-		http://kernel.org/pub/software/scm/git/${PN}-man-${DOC_VER}.tar.bz2
-		doc? ( http://kernel.org/pub/software/scm/git/${PN}-html-${DOC_VER}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail webdav"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		>=dev-lang/python-2.3
-		app-text/rcs
-		tcltk? ( dev-lang/tk )
-		dev-perl/String-ShellQuote
-		gitsendemail? ( dev-perl/Mail-Sendmail dev-perl/Email-Valid )"
-
-# 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 mozsha1 ; then
-		myopts="${myopts} MOZILLA_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"
-		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
-	fi
-
-	use gitsendemail && myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
-
-	# Older python versions need own subproccess.py
-	python_version
-	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i \
-		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
-		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
-		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
-		Makefile || die "sed failed"
-
-	exportmakeopts
-}
-
-src_compile() {
-	emake ${MY_MAKEOPTS} prefix=/usr || die "make failed"
-}
-
-src_install() {
-	make ${MY_MAKEOPTS} DESTDIR=${D} prefix=/usr install || die "make install failed"
-
-	use tcltk || rm ${D}/usr/bin/gitk
-
-	doman ${WORKDIR}/${PN}-man-${DOC_VER}/man?/*
-
-	dodoc README COPYING Documentation/SubmittingPatches
-	if use doc ; then
-		dodoc Documentation/technical/*
-		dodir /usr/share/doc/${PF}/html
-		cp -r ${WORKDIR}/${PN}-html-${DOC_VER}/* ${D}/usr/share/doc/${PF}/html
-	fi
-
-	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
-	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
-}
-
-src_test() {
-	cd ${S}
-	make ${MY_MAKEOPTS} test || die "tests failed"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you want to import arch repositories into git, consider using the"
-	einfo "git-archimport command. You should install dev-util/tla before"
-	einfo
-	einfo "If you want to import cvs repositories into git, consider using the"
-	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before"
-	einfo
-	einfo "If you want to import svn repositories into git, consider using the"
-	einfo "git-svnimport command. You should install dev-util/subversion before"
-	einfo
-}
diff --git a/dev-util/git/git-1.1.6.ebuild b/dev-util/git/git-1.1.6.ebuild
index 1090a5f56857..02df04ef7c44 100644
--- a/dev-util/git/git-1.1.6.ebuild
+++ b/dev-util/git/git-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.1.6.ebuild,v 1.2 2006/02/13 15:00:48 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.1.6.ebuild,v 1.3 2006/02/15 09:15:48 ferdy Exp $
 
 inherit python toolchain-funcs eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/software/scm/git/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail webdav"
 
 DEPEND="dev-libs/openssl