From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1J066v-0002da-TG for garchives@archives.gentoo.org; Thu, 06 Dec 2007 02:05:10 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lB6256xH018537; Thu, 6 Dec 2007 02:05:06 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lB6255nB018504 for ; Thu, 6 Dec 2007 02:05:05 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 0EC86657E1 for ; Thu, 6 Dec 2007 02:05:05 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1J066p-0006fY-MF for gentoo-commits@lists.gentoo.org; Thu, 06 Dec 2007 02:05:03 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-util/git: ChangeLog git-1.5.3.7-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog git-1.5.3.7-r1.ebuild X-VCS-Directories: dev-util/git X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: "Robin H. Johnson" Date: Thu, 06 Dec 2007 02:05:03 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 066e7678-95ec-4a84-a7e9-2214d786f013 X-Archives-Hash: e19e14794ae32f6eb602b2c5dad4dd8e robbat2 07/12/06 02:05:03 Modified: ChangeLog Added: git-1.5.3.7-r1.ebuild Log: Install the gitweb stuff, as it's used by instaweb, and is also independantly useful, but does not lend itself to webapp-config very well. (Portage version: 2.1.4_rc4) Revision Changes Path 1.235 dev-util/git/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.235&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.235&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?r1=1.234&r2=1.235 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v retrieving revision 1.234 retrieving revision 1.235 diff -p -w -b -B -u -u -r1.234 -r1.235 --- ChangeLog 5 Dec 2007 01:58:22 -0000 1.234 +++ ChangeLog 6 Dec 2007 02:05:03 -0000 1.235 @@ -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.234 2007/12/05 01:58:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.235 2007/12/06 02:05:03 robbat2 Exp $ + +*git-1.5.3.7-r1 (06 Dec 2007) + + 06 Dec 2007; Robin H. Johnson +git-1.5.3.7-r1.ebuild: + Install the gitweb stuff, as it's used by instaweb, and is also + independantly useful, but does not lend itself to webapp-config very well. *git-1.5.3.7 (05 Dec 2007) 1.1 dev-util/git/git-1.5.3.7-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild?rev=1.1&content-type=text/plain Index: git-1.5.3.7-r1.ebuild =================================================================== # 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.3.7-r1.ebuild,v 1.1 2007/12/06 02:05:03 robbat2 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, the revision control system heavily used by the Linux kernel team" HOMEPAGE="http://git.or.cz/" 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 cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" DEPEND=" !app-misc/git dev-libs/openssl sys-libs/zlib dev-lang/perl app-arch/cpio tk? ( dev-lang/tk ) curl? ( net-misc/curl ) webdav? ( dev-libs/expat ) emacs? ( virtual/emacs )" RDEPEND="${DEPEND} cgi? ( virtual/perl-CGI ) perl? ( dev-perl/Error ) gtk? ( >=dev-python/pygtk-2.8 )" SITEFILE=72${PN}-gentoo.el 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 iconv || myopts="${myopts} NO_ICONV=YesPlease" export MY_MAKEOPTS=${myopts} } showpkgdeps() { local pkg=$1 shift elog " $(printf "%-17s:" ${pkg}) ${@}" } src_unpack() { 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}" epatch "${FILESDIR}"/${PN}-1.5.3-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 if use cgi ; then emake ${MY_MAKEOPTS} \ DESTDIR="${D}" \ prefix=/usr \ gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" fi } src_install() { emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ die "make install failed" use tk || rm "${D}"/usr/bin/git{k,-gui} doman man?/* dodoc README Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html for d in / /howto/ /technical/ ; do einfo "Doing Documentation${d}" docinto ${d} dodoc Documentation${d}*.txt use doc && dohtml -p ${d} Documentation${d}*.html done docinto / dobashcompletion contrib/completion/git-completion.bash ${PN} if use emacs ; then elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ die "elisp-install failed" elisp-site-file-install "${FILESDIR}"/${SITEFILE} # don't add automatically to the load-path, so the sitefile # can do a conditional loading touch "${D}"/"${SITELISP}"/${PN}/.nosearch fi if use gtk ; then dobin "${S}"/contrib/gitview/gitview dodoc "${S}"/contrib/gitview/gitview.txt newbin "${S}"/contrib/blameview/blameview.perl blameview newdoc "${S}"/contrib/blameview/README README.blameview fi dodir /usr/share/${PN}/contrib for i in continuous fast-import hg-to-git \ hooks remotes2config.sh vim stats \ workdir ; do cp -rf \ "${S}"/contrib/${i} \ "${D}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done if use cgi ; then dodir /usr/share/${PN}/gitweb insinto /usr/share/${PN}/gitweb doins "${S}"/gitweb/gitweb.{cgi,css} doins "${S}"/gitweb/git-{favicon,logo}.png docinto / # INSTALL discusses configuration issues, not just installation dodoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb 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 if has userpriv "${FEATURES}"; then einfo "Enabling CVS tests as we have FEATURES=userpriv" else ewarn "Skipping CVS tests because CVS does not work as root!" ewarn "You should retest with FEATURES=userpriv!" for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do rm "${S}"/t/${i} || die "Failed to remove ${i}" done fi emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" } pkg_postinst() { if use emacs ; then elisp-site-regen elog "GNU Emacs has built-in Git support in versions greater 22.1." elog "You can disable the emacs USE flag for dev-util/git" elog "if you are using such a version." fi elog "These additional scripts need some dependencies:" elog "(These are also needed for FEATURES=test)" 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" \ "dev-perl/TermReadKey" showpkgdeps git-quiltimport "dev-util/quilt" showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" showpkgdeps git-instaweb \ "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" showpkgdeps git-send-email "USE=perl" showpkgdeps git-remote "USE=perl" echo } pkg_postrm() { use emacs && elisp-site-regen } -- gentoo-commits@gentoo.org mailing list