From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SImUf-0003wS-JS for garchives@archives.gentoo.org; Fri, 13 Apr 2012 19:49:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49C9EE0AF7; Fri, 13 Apr 2012 19:49:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0D5ADE0AF7 for ; Fri, 13 Apr 2012 19:49:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 168D51B4025 for ; Fri, 13 Apr 2012 19:49:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D369DE5402 for ; Fri, 13 Apr 2012 19:49:07 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1334346539.6a3aef14d7fffdafd841447effdd9306f9854dd4.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-libs/uclibc/files/uclibc-amd64.33.1.config sys-libs/uclibc/files/uclibc-amd64.33.config sys-libs/uclibc/files/uclibc-i686.33.config sys-libs/uclibc/files/uclibc-mips.33.1.config sys-libs/uclibc/files/uclibc-mips.33.config sys-libs/uclibc/files/uclibc-ppc.33.1.config sys-libs/uclibc/files/uclibc-ppc.config sys-libs/uclibc/files/uclibc-x86.33.1.config sys-libs/uclibc/uclibc-0.9.33-r1.ebuild sys-libs/uclibc/uclibc-0.9.33.1.ebuild sys-libs/uclibc/uclibc-0.9.33.ebuild X-VCS-Directories: sys-libs/uclibc/ sys-libs/uclibc/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 6a3aef14d7fffdafd841447effdd9306f9854dd4 X-VCS-Branch: uclibc Date: Fri, 13 Apr 2012 19:49:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e6d3bfba-32ba-495c-bed8-f70f076bc1ef X-Archives-Hash: 7edc675a77de9c4c04d1b2735f226d3f commit: 6a3aef14d7fffdafd841447effdd9306f9854dd4 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Apr 13 19:48:59 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Apr 13 19:48:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3D6a3aef14 sys-libs/uclibc: bump to 0.9.33.1, add savedconfig --- ...bc-amd64.33.config =3D> uclibc-amd64.33.1.config} | 0 ...libc-mips.33.config =3D> uclibc-mips.33.1.config} | 0 .../{uclibc-ppc.config =3D> uclibc-ppc.33.1.config} | 0 ...clibc-i686.33.config =3D> uclibc-x86.33.1.config} | 0 sys-libs/uclibc/uclibc-0.9.33-r1.ebuild | 65 --------------= ------ ...uclibc-0.9.33.ebuild =3D> uclibc-0.9.33.1.ebuild} | 31 ++++------ 6 files changed, 13 insertions(+), 83 deletions(-) diff --git a/sys-libs/uclibc/files/uclibc-amd64.33.config b/sys-libs/ucli= bc/files/uclibc-amd64.33.1.config similarity index 100% rename from sys-libs/uclibc/files/uclibc-amd64.33.config rename to sys-libs/uclibc/files/uclibc-amd64.33.1.config diff --git a/sys-libs/uclibc/files/uclibc-mips.33.config b/sys-libs/uclib= c/files/uclibc-mips.33.1.config similarity index 100% rename from sys-libs/uclibc/files/uclibc-mips.33.config rename to sys-libs/uclibc/files/uclibc-mips.33.1.config diff --git a/sys-libs/uclibc/files/uclibc-ppc.config b/sys-libs/uclibc/fi= les/uclibc-ppc.33.1.config similarity index 100% rename from sys-libs/uclibc/files/uclibc-ppc.config rename to sys-libs/uclibc/files/uclibc-ppc.33.1.config diff --git a/sys-libs/uclibc/files/uclibc-i686.33.config b/sys-libs/uclib= c/files/uclibc-x86.33.1.config similarity index 100% rename from sys-libs/uclibc/files/uclibc-i686.33.config rename to sys-libs/uclibc/files/uclibc-x86.33.1.config diff --git a/sys-libs/uclibc/uclibc-0.9.33-r1.ebuild b/sys-libs/uclibc/uc= libc-0.9.33-r1.ebuild deleted file mode 100644 index 877e951..0000000 --- a/sys-libs/uclibc/uclibc-0.9.33-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.eb= uild,v 1.9 2011/04/20 18:10:38 ulm Exp $ - -EAPI=3D"4" - -MY_P=3DuClibc-0.9.33-57f058b -MY_PN=3DuClibc-57f058b -DESCRIPTION=3D"C library for developing embedded Linux systems" -HOMEPAGE=3D"http://www.uclibc.org/" -SRC_URI=3D"http://opensource.dyc.edu/pub/misc/${MY_P}.tar.gz" - -LICENSE=3D"LGPL-2" -SLOT=3D"0" -KEYWORDS=3D"-* ~mips ~ppc" -IUSE=3D"" -RESTRICT=3D"strip" - -RDEPEND=3D"" -DEPEND=3D"" - -S=3D${WORKDIR}/${MY_PN} - -src_configure() { - case ${ARCH} in - x86) - cp "${FILESDIR}"/uclibc-i686.33.config .config || die "could not copy= config file" - ;; - amd64) - cp "${FILESDIR}"/uclibc-amd64.33.config .config || die "could not cop= y config file" - ;; - mips) - cp "${FILESDIR}"/uclibc-mips.33.config .config || die "could not copy= config file" - ;; - ppc) - cp "${FILESDIR}"/uclibc-ppc.33.config .config || die "could not copy = config file" - ;; - *) - eerror "${ARCH} is not supported" - esac - yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not m= ake oldconfig" -} - -src_compile() { - emake headers - emake - emake utils -} - -src_install() { - emake DESTDIR=3D"${D}" install - - # remove files coming from kernel-headers - rm -rf "${D}"/usr/include/{linux,asm*} - - emake DESTDIR=3D"${D}" install_utils - dobin extra/scripts/getent - dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 -} - -pkg_postinst() { - echo "UTC" > "${ROOT}"/etc/TZ - /sbin/ldconfig - [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null -} diff --git a/sys-libs/uclibc/uclibc-0.9.33.ebuild b/sys-libs/uclibc/uclib= c-0.9.33.1.ebuild similarity index 66% rename from sys-libs/uclibc/uclibc-0.9.33.ebuild rename to sys-libs/uclibc/uclibc-0.9.33.1.ebuild index 24e0dda..4a46920 100644 --- a/sys-libs/uclibc/uclibc-0.9.33.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.33.1.ebuild @@ -4,14 +4,16 @@ =20 EAPI=3D"4" =20 -MY_P=3DuClibc-0.9.33 +inherit savedconfig + +MY_P=3DuClibc-${PV} DESCRIPTION=3D"C library for developing embedded Linux systems" HOMEPAGE=3D"http://www.uclibc.org/" SRC_URI=3D"http://uclibc.org/downloads/${MY_P}.tar.bz2" =20 LICENSE=3D"LGPL-2" SLOT=3D"0" -KEYWORDS=3D"-* amd64 x86" +KEYWORDS=3D"-* amd64 x86 ~mips ~ppc" IUSE=3D"" RESTRICT=3D"strip" =20 @@ -21,22 +23,11 @@ DEPEND=3D"" S=3D${WORKDIR}/${MY_P} =20 src_configure() { - case ${ARCH} in - x86) - cp "${FILESDIR}"/uclibc-i686.33.config .config || die "could not copy= config file" - ;; - amd64) - cp "${FILESDIR}"/uclibc-amd64.33.config .config || die "could not cop= y config file" - ;; - mips) - cp "${FILESDIR}"/uclibc-mips.33.config .config || die "could not copy= config file" - ;; - ppc) - cp "${FILESDIR}"/uclibc-ppc.33.config .config || die "could not copy = config file" - ;; - *) - eerror "${ARCH} is not supported" - esac + if use savedconfig; then + restore_config config/.config + else + cp "${FILESDIR}"/uclibc-${ARCH}.${PV}.config .config || die "${ARCH} i= s not supported" + fi yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not m= ake oldconfig" } =20 @@ -55,6 +46,10 @@ src_install() { emake DESTDIR=3D"${D}" install_utils dobin extra/scripts/getent dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 + + if use savedconfig; then + save_config config/.config + fi } =20 pkg_postinst() {