Create relative symlinks instead of absolute ones.

(Portage version: 2.1.2.2)

4 files changed, 189 insertions, 1 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 148a41b80bfd..f1bfb06ebb56 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.172 2007/03/09 18:42:09 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.173 2007/03/11 23:10:55 ferdy Exp $
+
+*git-1.5.0.3-r1 (11 Mar 2007)
+
+  11 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/git-1.5.0-symlinks.patch, +git-1.5.0.3-r1.ebuild:
+  Create relative symlinks instead of absolute ones.
 
 *git-1.5.0.3 (09 Mar 2007)
 
diff --git a/dev-util/git/files/digest-git-1.5.0.3-r1 b/dev-util/git/files/digest-git-1.5.0.3-r1
new file mode 100644
index 000000000000..c70d94fdf0d8
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.0.3-r1
@@ -0,0 +1,9 @@
+MD5 ea7a01dbde1da8fce235dde689bfeeea git-1.5.0.3.tar.bz2 1047037
+RMD160 763d78af5f8e394fa38a0a8ab702472a440eca47 git-1.5.0.3.tar.bz2 1047037
+SHA256 950be95ece89a4c03aa22cd93626a27619536d1b9d40631b4369c339d63c120a git-1.5.0.3.tar.bz2 1047037
+MD5 3734c743f997db911a8d2bbb671b70de git-htmldocs-1.5.0.3.tar.bz2 442764
+RMD160 69bbc0a67d05e907134f1acc02b76c819838501e git-htmldocs-1.5.0.3.tar.bz2 442764
+SHA256 e9a0fb0d99fbd24419949e728c057ebe6e3e843630f39b2c5ae487d26ece9526 git-htmldocs-1.5.0.3.tar.bz2 442764
+MD5 94a9c3de6e1dea0e4498901b6a95c9ad git-manpages-1.5.0.3.tar.bz2 126643
+RMD160 8bfbb22b4c78c264be743582c0988722e692a2a5 git-manpages-1.5.0.3.tar.bz2 126643
+SHA256 4e36be729d14e93d26bb165e0888ed65ef8bb487df5f4f67160568fe9edeb3bb git-manpages-1.5.0.3.tar.bz2 126643
diff --git a/dev-util/git/files/git-1.5.0-symlinks.patch b/dev-util/git/files/git-1.5.0-symlinks.patch
new file mode 100644
index 000000000000..282dee8d58b8
--- /dev/null
+++ b/dev-util/git/files/git-1.5.0-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 084b7fe..ea297a4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -901,7 +901,7 @@ install: all
+ 		cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
+ 			'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
+ 	fi
+-	$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
++	$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ ifneq (,$X)
+ 	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
+ endif
diff --git a/dev-util/git/git-1.5.0.3-r1.ebuild b/dev-util/git/git-1.5.0.3-r1.ebuild
new file mode 100644
index 000000000000..4ac4332fa900
--- /dev/null
+++ b/dev-util/git/git-1.5.0.3-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.3-r1.ebuild,v 1.1 2007/03/11 23:10:55 ferdy Exp $
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker"
+HOMEPAGE="http://kernel.org/pub/software/scm/git/"
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
+
+DEPEND="dev-libs/openssl
+		sys-libs/zlib
+		!app-misc/git
+		curl? ( net-misc/curl )
+		webdav? ( dev-libs/expat )
+		emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+		dev-lang/perl
+		perl? ( dev-perl/Error )
+		tk? ( dev-lang/tk )
+		gtk? ( >=dev-python/pygtk-2.6 )"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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
+
+	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
+
+	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
+	export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch
+
+	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):" \
+		-e 's:ln :ln -s :g' \
+		Makefile || die "sed failed"
+
+	exportmakeopts
+}
+
+src_compile() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
+	fi
+}
+
+src_install() {
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
+
+	use tk || rm "${D}"/usr/bin/gitk
+
+	doman "${WORKDIR}"/man?/*
+
+	dodoc README COPYING Documentation/SubmittingPatches
+	if use doc ; then
+		dodoc Documentation/technical/*
+		dodir /usr/share/doc/${PF}/html
+		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		insinto "${SITELISP}"
+		doins contrib/emacs/{,vc-}git.el*
+		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
+	fi
+
+	if use gtk ; then
+		dobin contrib/gitview/gitview
+		use doc && dodoc contrib/gitview/gitview.txt
+	fi
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	cd "${S}"
+	has_version dev-util/subversion || \
+		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
+	has_version app-arch/unzip || \
+		rm "${S}"/t/t5000-tar-tree.sh
+	# Stupid CVS won't let some people commit as root
+	rm "${S}"/t/t9200-git-cvsexportcommit.sh
+	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-archimport "dev-util/tla"
+	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
+	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
+	showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl"
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-send-email "USE=perl"
+	showpkgdeps git-remote "USE=perl"
+	echo
+}
+
+pkg_postrm() {
+	# regenerate site-gentoo if we are merged USE=emacs and unmerged
+	# USE=-emacs
+	has_version virtual/emacs && elisp-site-regen
+}