* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-1.7.2-r1.ebuild
@ 2010-07-22 21:34 Jeremy Olexa (darkside)
0 siblings, 0 replies; 2+ messages in thread
From: Jeremy Olexa (darkside) @ 2010-07-22 21:34 UTC (permalink / raw
To: gentoo-commits
darkside 10/07/22 21:34:51
Modified: ChangeLog
Added: git-1.7.2-r1.ebuild
Log:
Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patches, modify paths, etc. Approved by maintainer, reference bug 329273. Revbump per request but no substantial changes for the end user
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.19 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 22 Jul 2010 16:56:06 -0000 1.18
+++ ChangeLog 22 Jul 2010 21:34:50 -0000 1.19
@@ -1,6 +1,15 @@
# 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.18 2010/07/22 16:56:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.19 2010/07/22 21:34:50 darkside Exp $
+
+*git-1.7.2-r1 (22 Jul 2010)
+
+ 22 Jul 2010; Jeremy Olexa <darkside@gentoo.org>
+ +files/git-1.6.6.1-interix6.patch, +files/git-1.7.1-interix.patch,
+ +git-1.7.2-r1.ebuild:
+ Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patches,
+ modify paths, etc. Approved by maintainer, reference bug 329273. Revbump
+ per request but no substantial changes for the end user
*git-1.7.2 (22 Jul 2010)
1.1 dev-vcs/git/git-1.7.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: git-1.7.2-r1.ebuild
===================================================================
# 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.2-r1.ebuild,v 1.1 2010/07/22 21:34:50 darkside Exp $
EAPI=3
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 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
subversion? ( dev-vcs/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-vcs/subversion && built_with_use --missing false dev-vcs/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
# broken assumptions, because of broken build system ...
myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
myopts="${myopts} INSTALL=install TAR=tar"
myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/bash"
myopts="${myopts} SANE_TOOL_PATH="
myopts="${myopts} OLD_ICONV="
myopts="${myopts} NO_EXTERNAL_GREP="
# can't define this to null, since the entire makefile depends on it
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
use !elibc_glibc && use iconv && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
use iconv \
|| einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205."
# || 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"
# Disabled until ~m68k-mint can be keyworded again
# if [[ ${CHOST} == *-mint* ]] ; then
# myopts="${myopts} NO_MMAP=YesPlease"
# myopts="${myopts} NO_IPV6=YesPlease"
# myopts="${myopts} NO_STRLCPY=YesPlease"
# myopts="${myopts} NO_MEMMEM=YesPlease"
# myopts="${myopts} NO_MKDTEMP=YesPlease"
# myopts="${myopts} NO_MKSTEMPS=YesPlease"
# fi
if [[ ${CHOST} == *-interix* ]] ; then
myopts="${myopts} NO_IPV6=YesPlease"
myopts="${myopts} NO_MEMMEM=YesPlease"
myopts="${myopts} NO_MKDTEMP=YesPlease"
myopts="${myopts} NO_STRTOUMAX=YesPlease"
myopts="${myopts} NO_STRTOULL=YesPlease"
myopts="${myopts} NO_INET_NTOP=YesPlease"
myopts="${myopts} NO_INET_PTON=YesPlease"
myopts="${myopts} NO_NSEC=YesPlease"
myopts="${myopts} NO_MKSTEMPS=YesPlease"
fi
if [[ ${CHOST} == ia64-*-hpux* ]]; then
myopts="${myopts} NO_NSEC=YesPlease"
fi
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.2-always-install-js.patch
# USE=-iconv causes segfaults, fixed post 1.7.1
# Gentoo bug #321895
#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
sed -i \
-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-e 's:^\(CC = \).*$:\1$(OPTCC):' \
-e 's:^\(AR = \).*$:\1$(OPTAR):' \
-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
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"
# bug #318289
epatch "${FILESDIR}"/git-1.7.1-interix.patch
epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch
}
git_emake() {
emake ${MY_MAKEOPTS} \
DESTDIR="${D}" \
OPTCFLAGS="${CFLAGS}" \
OPTLDFLAGS="${LDFLAGS}" \
OPTCC="$(tc-getCC)" \
OPTAR="$(tc-getAR)" \
prefix="${EPREFIX}"/usr \
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
sysconfdir="${EPREFIX}"/etc \
"$@"
}
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 "${ED}${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} \
"${ED}"/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 "${ED}"/usr/lib64/perl5/ \
-name .packlist \
-exec rm \{\} \;
fi
if ! use subversion ; then
rm -f "${ED}"/usr/libexec/git-core/git-svn \
"${ED}"/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-vcs/cvs && \
let cvs=$cvs+1
[[ $cvs -gt 1 ]] && \
built_with_use dev-vcs/cvs server && \
let cvs=$cvs+1
if [[ $cvs -lt 3 ]]; then
einfo "Disabling CVS tests (needs dev-vcs/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-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
ewarn "You must build dev-vcs/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
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-1.7.2-r1.ebuild
@ 2010-07-31 10:17 Fabian Groffen (grobian)
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen (grobian) @ 2010-07-31 10:17 UTC (permalink / raw
To: gentoo-commits
grobian 10/07/31 10:17:23
Modified: ChangeLog git-1.7.2-r1.ebuild
Log:
Fix compilation with USE=-iconv on non-glibc platforms since disabling of iconv is still ignored due to bugs mentioned in the ebuild
(Portage version: 2.2.01.15449-prefix/cvs/SunOS i386)
Revision Changes Path
1.21 dev-vcs/git/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 30 Jul 2010 21:01:32 -0000 1.20
+++ ChangeLog 31 Jul 2010 10:17:23 -0000 1.21
@@ -1,6 +1,10 @@
# 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.20 2010/07/30 21:01:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.21 2010/07/31 10:17:23 grobian Exp $
+
+ 31 Jul 2010; Fabian Groffen <grobian@gentoo.org> git-1.7.2-r1.ebuild:
+ Fix compilation with USE=-iconv on non-glibc platforms since disabling of
+ iconv is still ignored due to bugs mentioned in the ebuild
30 Jul 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.6.3.1.ebuild,
-git-1.6.3.3.ebuild, -git-1.6.3.4.ebuild, -git-1.6.4.ebuild,
1.2 dev-vcs/git/git-1.7.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild?r1=1.1&r2=1.2
Index: git-1.7.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-1.7.2-r1.ebuild 22 Jul 2010 21:34:50 -0000 1.1
+++ git-1.7.2-r1.ebuild 31 Jul 2010 10:17:23 -0000 1.2
@@ -1,6 +1,6 @@
# 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.2-r1.ebuild,v 1.1 2010/07/22 21:34:50 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r1.ebuild,v 1.2 2010/07/31 10:17:23 grobian Exp $
EAPI=3
@@ -123,11 +123,13 @@
# can't define this to null, since the entire makefile depends on it
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
- use !elibc_glibc && use iconv && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
use iconv \
- || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205."
+ || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
# || myopts="${myopts} NO_ICONV=YesPlease"
+ # because, above, we need to do this unconditionally (no "&& use iconv")
+ use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
use tk \
|| myopts="${myopts} NO_TCLTK=YesPlease"
use perl \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-31 11:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-31 10:17 [gentoo-commits] gentoo-x86 commit in dev-vcs/git: ChangeLog git-1.7.2-r1.ebuild Fabian Groffen (grobian)
-- strict thread matches above, loose matches on Subject: below --
2010-07-22 21:34 Jeremy Olexa (darkside)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox