* [gentoo-commits] proj/hardened-dev:uclibc commit in: dev-vcs/git/, profiles/hardened/linux/uclibc/
@ 2011-12-29 23:48 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2011-12-29 23:48 UTC (permalink / raw
To: gentoo-commits
commit: f4096f6f03fe297fe028e77cd8792d6d40a8f9be
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 23:47:58 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 23:47:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=f4096f6f
dev-vcs/git: ask for no ICONV, unmask coreutils-8.5-r1
(Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
dev-vcs/git/git-1.7.0.4.ebuild | 11 +----------
profiles/hardened/linux/uclibc/package.mask | 2 +-
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/dev-vcs/git/git-1.7.0.4.ebuild b/dev-vcs/git/git-1.7.0.4.ebuild
index bb1658f..9ab3105 100644
--- a/dev-vcs/git/git-1.7.0.4.ebuild
+++ b/dev-vcs/git/git-1.7.0.4.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
}
git_emake() {
- emake ${MY_MAKEOPTS} \
+ emake "NO_NSEC=YesPlease NO_ICONV=YesPlease" \
DESTDIR="${D}" \
OPTCFLAGS="${CFLAGS}" \
OPTLDFLAGS="${LDFLAGS}" \
@@ -47,15 +47,6 @@ git_emake() {
"$@"
}
-src_configure() {
- local myopts
-
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
-}
-
src_compile() {
git_emake
}
diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/hardened/linux/uclibc/package.mask
index 5e524c7..df94406 100644
--- a/profiles/hardened/linux/uclibc/package.mask
+++ b/profiles/hardened/linux/uclibc/package.mask
@@ -9,6 +9,6 @@ dev-libs/glib
>dev-util/pkgconfig-0.25-r2
>dev-vcs/git-1.7.0.4
>net-misc/dhcp-3.1.2_p1
->sys-apps/coreutils-8.4
+>sys-apps/coreutils-8.5-r1
>sys-apps/util-linux-2.18-r1
>sys-fs/udev-141
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: dev-vcs/git/, profiles/hardened/linux/uclibc/
@ 2011-12-31 18:31 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2011-12-31 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 98210a7d7dc6e1326b0b15c8a345a66782f9372f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 18:30:57 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 18:30:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=98210a7d
dev-vcs/git: removed and masked all versions of git above 1.7
---
dev-vcs/git/git-1.7.0.4.ebuild | 56 ---------------------------
dev-vcs/git/metadata.xml | 8 ----
profiles/hardened/linux/uclibc/package.mask | 2 +-
3 files changed, 1 insertions(+), 65 deletions(-)
diff --git a/dev-vcs/git/git-1.7.0.4.ebuild b/dev-vcs/git/git-1.7.0.4.ebuild
deleted file mode 100644
index 9ab3105..0000000
--- a/dev-vcs/git/git-1.7.0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/Attic/git-1.7.0.4.ebuild,v 1.4 2010/07/30 21:01:32 robbat2 dead $
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-SRC_URI="http://dev.gentoo.org/~blueness/misc/${P}.tgz"
-KEYWORDS="amd64 x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-arch/cpio"
-
-src_prepare() {
- sed -i \
- -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC = \).*$:\1$(OPTCC):' \
- -e 's:^\(AR = \).*$:\1$(OPTAR):' \
- Makefile || die "sed failed"
-
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
-}
-
-git_emake() {
- emake "NO_NSEC=YesPlease NO_ICONV=YesPlease" \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix=/usr \
- "$@"
-}
-
-src_compile() {
- git_emake
-}
-
-src_install() {
- git_emake install
-}
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
deleted file mode 100644
index 8944b17..0000000
--- a/dev-vcs/git/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
-</pkgmetadata>
diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/hardened/linux/uclibc/package.mask
index df94406..c1f9b07 100644
--- a/profiles/hardened/linux/uclibc/package.mask
+++ b/profiles/hardened/linux/uclibc/package.mask
@@ -7,7 +7,7 @@ dev-libs/glib
>app-admin/sudo-1.7.4_p5
>app-text/tree-1.5.3
>dev-util/pkgconfig-0.25-r2
->dev-vcs/git-1.7.0.4
+>dev-vcs/git-1.7
>net-misc/dhcp-3.1.2_p1
>sys-apps/coreutils-8.5-r1
>sys-apps/util-linux-2.18-r1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-31 18:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-31 18:31 [gentoo-commits] proj/hardened-dev:uclibc commit in: dev-vcs/git/, profiles/hardened/linux/uclibc/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2011-12-29 23:48 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox