From: Fernando J. Pereda Date: Sun, 11 Mar 2007 23:10:55 +0000 (+0000) Subject: Create relative symlinks instead of absolute ones. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e75a5ef7f880d85510dcba9f663f35099a0e705b;p=gentoo.git Create relative symlinks instead of absolute ones. Package-Manager: portage-2.1.2.2 --- 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 + +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/Manifest b/dev-util/git/Manifest index 8c919f72deb1..3d359651ba63 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -5,6 +5,10 @@ AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f MD5 626503da08b9af48199596c83d6f49b3 files/70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd files/70git-gentoo.el 88 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a files/70git-gentoo.el 88 +AUX git-1.5.0-symlinks.patch 652 RMD160 248ec978bd7aece96b0a9b27b2da00f5a6fa400b SHA1 0a19157c0c577e3560443a9a636684b0477eadf8 SHA256 52f7e1394f41b0138682b196fd12a5acd0a04e524317a815dd464e67d9e0bd09 +MD5 532e02bd8bfc22e803d4295b0890e5cd files/git-1.5.0-symlinks.patch 652 +RMD160 248ec978bd7aece96b0a9b27b2da00f5a6fa400b files/git-1.5.0-symlinks.patch 652 +SHA256 52f7e1394f41b0138682b196fd12a5acd0a04e524317a815dd464e67d9e0bd09 files/git-1.5.0-symlinks.patch 652 AUX git-daemon.confd 376 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f SHA1 3a00fa3af96d83bec1589d7ef53eff01ea838ea1 SHA256 266045958a3a4072529f25208d1f84a178bbb10aa0b6fa19543f7a62f9a5e3fe MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f files/git-daemon.confd 376 @@ -48,14 +52,18 @@ EBUILD git-1.4.4.4.ebuild 4257 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd S MD5 844bef7b02245814e4362aa29566e57b git-1.4.4.4.ebuild 4257 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd git-1.4.4.4.ebuild 4257 SHA256 963f02c4077e2ca70a12f7300caa552a0bfccf76d57dc8b02a1ed3099efe3493 git-1.4.4.4.ebuild 4257 +EBUILD git-1.5.0.3-r1.ebuild 4379 RMD160 abd60430b4099190f528192013ca55e005e8c565 SHA1 935edfd395e573e708c6ee213a36b579b221148b SHA256 a4009050f396f3bbb095ad0b56823cc3805c7c5fac6d7efe16186f9e4dde3269 +MD5 5e2fe94b34ee01828346c163d73d8aea git-1.5.0.3-r1.ebuild 4379 +RMD160 abd60430b4099190f528192013ca55e005e8c565 git-1.5.0.3-r1.ebuild 4379 +SHA256 a4009050f396f3bbb095ad0b56823cc3805c7c5fac6d7efe16186f9e4dde3269 git-1.5.0.3-r1.ebuild 4379 EBUILD git-1.5.0.3.ebuild 4326 RMD160 fbdd4e23ec76948cec7b20976bbb74343e6d5dc0 SHA1 d8dd5c6faeea0c99dc7c2a33136a77d82313f146 SHA256 38a71415fa2f485b771d5d9f1e39a3f27622d3de38e0ad9a9c1d234f9ebb3b3f MD5 d02282ef6bffa28c5e63a85f4f4630bb git-1.5.0.3.ebuild 4326 RMD160 fbdd4e23ec76948cec7b20976bbb74343e6d5dc0 git-1.5.0.3.ebuild 4326 SHA256 38a71415fa2f485b771d5d9f1e39a3f27622d3de38e0ad9a9c1d234f9ebb3b3f git-1.5.0.3.ebuild 4326 -MISC ChangeLog 24586 RMD160 720c775e4d42c9243f230a3a747ecd4dc6e119ab SHA1 01c3faaf4a7855b19a27b0cdf2885d6559379e05 SHA256 596f69d5c90d0c9f8e62fe2442f5ebf037cda91cd99de45f3968d23148d58cfd -MD5 117fcb22590786aba57eab446e613e4b ChangeLog 24586 -RMD160 720c775e4d42c9243f230a3a747ecd4dc6e119ab ChangeLog 24586 -SHA256 596f69d5c90d0c9f8e62fe2442f5ebf037cda91cd99de45f3968d23148d58cfd ChangeLog 24586 +MISC ChangeLog 24783 RMD160 faf85cbbc0db9c3ec1fd96c2a24ebd8ddbe137c8 SHA1 58468b00748bb4db8e74654b31f22d4a9375d959 SHA256 1e07d0b5a526637b33d3415a540bfcb8701f8d7c406c62beef2abdc53bc6c108 +MD5 ceca4c43237534ad273c51e46db85286 ChangeLog 24783 +RMD160 faf85cbbc0db9c3ec1fd96c2a24ebd8ddbe137c8 ChangeLog 24783 +SHA256 1e07d0b5a526637b33d3415a540bfcb8701f8d7c406c62beef2abdc53bc6c108 ChangeLog 24783 MISC metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a SHA1 7c2340e011ce57927ff31d7e3397ef4bb1c7ad27 SHA256 1f2e9f9f57e781c296ac5c39c54eabf82a47b7facd0698b296bc76f50799432c MD5 22c5a3ad567fa12332dab8687b9c2d1c metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a metadata.xml 253 @@ -75,10 +83,13 @@ SHA256 ace650aa865e2cbf70cf1e76a858085da178e9f98f58f28bbabbc972be98467e files/di MD5 5df9ac9771897de5afc47fbc86c9784b files/digest-git-1.5.0.3 771 RMD160 0ec0f01ccc0de507ffa3f5a607eaaf21cc99143e files/digest-git-1.5.0.3 771 SHA256 9dcab354ddc419fa9998d1240a8bedef3cf497c26eb4443b176939aa5029c629 files/digest-git-1.5.0.3 771 +MD5 5df9ac9771897de5afc47fbc86c9784b files/digest-git-1.5.0.3-r1 771 +RMD160 0ec0f01ccc0de507ffa3f5a607eaaf21cc99143e files/digest-git-1.5.0.3-r1 771 +SHA256 9dcab354ddc419fa9998d1240a8bedef3cf497c26eb4443b176939aa5029c629 files/digest-git-1.5.0.3-r1 771 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFF8aqRViELBEf1JB0RAtM7AJ9G3uICk8tqShCrRrhyXiYjphksVACfUbvP -oQwcfCEqvb1J95sdpO9Kz4E= -=voFU +iD8DBQFF9IyNViELBEf1JB0RAn8EAJ9zyP6Rp0Q9gtU8AHkI+XvFk2Y9ZwCbBzou +z24EF0c66mcPi7FpFnhxsUo= +=/geO -----END PGP SIGNATURE----- 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 +}