From: Mike Frysinger Date: Thu, 7 Sep 2006 17:03:22 +0000 (+0000) Subject: Fixup previous cross-compile commit and fix handling of /etc/portage files when deali... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c595fba90db2c6bfb969f9e81374ff0a4b224526;p=gentoo.git Fixup previous cross-compile commit and fix handling of /etc/portage files when dealing with subdirs. Package-Manager: portage-2.1.1_rc1-r6 --- diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog index c8910a06ffb1..d9c1bf5c54f3 100644 --- a/sys-devel/crossdev/ChangeLog +++ b/sys-devel/crossdev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/crossdev # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.38 2006/09/03 11:31:45 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.39 2006/09/07 17:03:22 vapier Exp $ + +*crossdev-0.9.16-r2 (07 Sep 2006) + + 07 Sep 2006; Mike Frysinger files/crossdev, + +crossdev-0.9.16-r2.ebuild: + Fixup previous cross-compile commit and fix handling of /etc/portage files + when dealing with subdirs. *crossdev-0.9.16-r1 (03 Sep 2006) diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest index 5bbf3073c0fc..5f8cddb124a0 100644 --- a/sys-devel/crossdev/Manifest +++ b/sys-devel/crossdev/Manifest @@ -1,29 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX crossdev 17786 RMD160 f94baec8099604d7b48172df7e238ca3888919ee SHA1 a5bfc4ef69c9e4bbed020fa5240a8e8b1561f07f SHA256 9e4582a457d3d0a8cfb6f7ff5e83db4487542cdc0eaff016ef027fddaae17ca8 -MD5 f1a410bfe922204df86e6bcae1b9f3f4 files/crossdev 17786 -RMD160 f94baec8099604d7b48172df7e238ca3888919ee files/crossdev 17786 -SHA256 9e4582a457d3d0a8cfb6f7ff5e83db4487542cdc0eaff016ef027fddaae17ca8 files/crossdev 17786 -EBUILD crossdev-0.9.16-r1.ebuild 596 RMD160 7fdcc87d535fc426f7c7dac53387fe7f08623aee SHA1 0e11fa465cf60e429f98367e25311cf375eec4cb SHA256 590c928c4e8b1c6a277b54e6c2bfc4a6debcc4622dd7f3bc72042f69bace4991 -MD5 481ecdd2d26f116b9c5fba1c22c34a53 crossdev-0.9.16-r1.ebuild 596 -RMD160 7fdcc87d535fc426f7c7dac53387fe7f08623aee crossdev-0.9.16-r1.ebuild 596 -SHA256 590c928c4e8b1c6a277b54e6c2bfc4a6debcc4622dd7f3bc72042f69bace4991 crossdev-0.9.16-r1.ebuild 596 -MISC ChangeLog 8039 RMD160 1b1a29561b656a99184a1abb0e1d80997f52fb84 SHA1 83b290634864ffef39829378334895ca9ddd0d62 SHA256 4229a74b66235c55e516cdbb95252b9a0ff114a81d6e82a32b72c17d3dbf8c9c -MD5 5f1c89f021838fb5c7ae7e08c917c167 ChangeLog 8039 -RMD160 1b1a29561b656a99184a1abb0e1d80997f52fb84 ChangeLog 8039 -SHA256 4229a74b66235c55e516cdbb95252b9a0ff114a81d6e82a32b72c17d3dbf8c9c ChangeLog 8039 +AUX crossdev 17783 RMD160 0c451b79bf35a03e02c792366fe11954087ef45f SHA1 589437f76cd26e641e0b83cf61bb49ab9b50380a SHA256 e0cd8c93503b05953e3cbd3c67649de704f57903ee7880f45399342784ffa53d +MD5 c81559f50e8da60cb5536e5a5243a07b files/crossdev 17783 +RMD160 0c451b79bf35a03e02c792366fe11954087ef45f files/crossdev 17783 +SHA256 e0cd8c93503b05953e3cbd3c67649de704f57903ee7880f45399342784ffa53d files/crossdev 17783 +EBUILD crossdev-0.9.16-r2.ebuild 593 RMD160 0838e5e66b26557383cb2c0293f8f5de908d5fbe SHA1 e0256fc050e20ddfbce98e801ec93881ac5ac317 SHA256 85a29a68a17b6328bdc14c624302d06cb09d76f887bb68ff93276d9e54c0b5ee +MD5 625f7ce76cca38fe6288d17797d2ed08 crossdev-0.9.16-r2.ebuild 593 +RMD160 0838e5e66b26557383cb2c0293f8f5de908d5fbe crossdev-0.9.16-r2.ebuild 593 +SHA256 85a29a68a17b6328bdc14c624302d06cb09d76f887bb68ff93276d9e54c0b5ee crossdev-0.9.16-r2.ebuild 593 +MISC ChangeLog 8274 RMD160 3b1cb069e2c3634d1e28db0917d3f27eae79804f SHA1 e2b7b5c5bfe7b17ad64b5d542df33567025e91cf SHA256 4327ebf818bf54a319ddd5028a2514534f2b1a50a1a22c26dde23a0b901794e0 +MD5 46cbf9c2f0b518fe961f67f66231fa0c ChangeLog 8274 +RMD160 3b1cb069e2c3634d1e28db0917d3f27eae79804f ChangeLog 8274 +SHA256 4327ebf818bf54a319ddd5028a2514534f2b1a50a1a22c26dde23a0b901794e0 ChangeLog 8274 MISC metadata.xml 222 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 SHA1 e965b449efbf26435730e93c78602fb5d8cdce0e SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 metadata.xml 222 SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f metadata.xml 222 -MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-crossdev-0.9.16-r1 1 -RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-crossdev-0.9.16-r1 1 -SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-crossdev-0.9.16-r1 1 +MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-crossdev-0.9.16-r2 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-crossdev-0.9.16-r2 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-crossdev-0.9.16-r2 1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE+r/55mJXAu5GbtIRAvviAJ96zL9lv094l+0g2Y34CBLD+bv7wgCdEr4D -l7R/LFl1I+RyK+3e5Ot3AGw= -=XTNT +iD8DBQFFAFDramhnQswr0vIRAmXBAKCtXAOTEfd9WFy3mZUhsibJZL1gPACeM4R5 +auJ0fDoCMrUziZg2hVQaDWE= +=p89x -----END PGP SIGNATURE----- diff --git a/sys-devel/crossdev/crossdev-0.9.16-r2.ebuild b/sys-devel/crossdev/crossdev-0.9.16-r2.ebuild new file mode 100644 index 000000000000..483cedc9b24c --- /dev/null +++ b/sys-devel/crossdev/crossdev-0.9.16-r2.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.16-r2.ebuild,v 1.1 2006/09/07 17:03:22 vapier Exp $ + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=sys-apps/portage-2.1 + app-shells/bash" + +src_install() { + dosbin "${FILESDIR}"/crossdev || die + dosed "s:GENTOO_PV:${PV}:" /usr/sbin/crossdev +} diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev index a39e3472b433..b18a2e2895a5 100755 --- a/sys-devel/crossdev/files/crossdev +++ b/sys-devel/crossdev/files/crossdev @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.72 2006/09/03 11:31:45 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.73 2006/09/07 17:03:22 vapier Exp $ cd / @@ -464,7 +464,6 @@ set_keywords() { sed -i -e "/^cross-${CTARGET}\/${pkg} /d" ${output} else output="package.keywords/cross-${CTARGET}" - rm -f ${output} fi if [[ ${ver} == "[latest]" ]] || [[ -z ${ver} ]] ; then echo "cross-${CTARGET}/${pkg} $TARCH ~$TARCH" >> ${output} @@ -475,7 +474,6 @@ set_keywords() { sed -i -e "/cross-${CTARGET}\/${pkg}/d" ${output} else output="package.mask/cross-${CTARGET}" - rm -f ${output} fi echo ">cross-${CTARGET}/${pkg}-${ver}" >> ${output} fi @@ -524,7 +522,9 @@ grep -qs "^cross-${CTARGET}$" /etc/portage/categories \ mkdir -p "${PORTDIR_OVERLAY}"/cross-${CTARGET} cd /etc/portage for f in package.{keywords,mask,use} ; do - [[ ! -e ${f} ]] && mkdir ${f} + [[ -f ${f} ]] && continue + mkdir -p ${f} + rm -f ${f}/cross-${CTARGET} done set_portage ${BCAT} ${BPKG} ${BVER} @@ -608,7 +608,7 @@ USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="" \ doemerge ${LPKG} is_s4 || exit 0 -set_eopts_on_pkg_status ${GPKG} crosscompile_opts_headers-only +set_eopts_on_pkg_status ${GPKG} crosscompile_opts_bootstrap USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \ doemerge ${GPKG} ${GPKG}-stage2 diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.16-r2 b/sys-devel/crossdev/files/digest-crossdev-0.9.16-r2 new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/sys-devel/crossdev/files/digest-crossdev-0.9.16-r2 @@ -0,0 +1 @@ +