From: Chris Gianelloni Date: Tue, 3 Apr 2007 21:06:38 +0000 (+0000) Subject: Add a new patch/revision to resolve bug #168325. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08e2722075a669485649ba083db49115314083d8;p=gentoo.git Add a new patch/revision to resolve bug #168325. Package-Manager: portage-2.1.2.2 --- diff --git a/app-misc/livecd-tools/ChangeLog b/app-misc/livecd-tools/ChangeLog index 9329eefe4743..c83ec7f00e2a 100644 --- a/app-misc/livecd-tools/ChangeLog +++ b/app-misc/livecd-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/livecd-tools # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.85 2007/03/14 18:14:10 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.86 2007/04/03 21:06:38 wolf31o2 Exp $ + +*livecd-tools-1.0.35-r1 (03 Apr 2007) + + 03 Apr 2007; Chris Gianelloni + +files/livecd-tools-1.0.35-umounts.patch, +livecd-tools-1.0.35-r1.ebuild: + Add a new patch/revision to resolve bug #168325. 14 Mar 2007; Chris Gianelloni livecd-tools-1.0.33-r2.ebuild, livecd-tools-1.0.34.ebuild, diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest index 3b91d69fd8b2..553e75fe1f23 100644 --- a/app-misc/livecd-tools/Manifest +++ b/app-misc/livecd-tools/Manifest @@ -9,6 +9,10 @@ AUX livecd-tools-1.0.33-openglify.patch 1536 RMD160 01e0e2b9445994791bb1ab19b3e3 MD5 a78751d8b4f5392c021399bc2890d090 files/livecd-tools-1.0.33-openglify.patch 1536 RMD160 01e0e2b9445994791bb1ab19b3e35e6be5bde8a5 files/livecd-tools-1.0.33-openglify.patch 1536 SHA256 a2a06f99bb3fdd0f642d259ebcbdb61d3b0afd0ab408cff1b71fc3a61abdd080 files/livecd-tools-1.0.33-openglify.patch 1536 +AUX livecd-tools-1.0.35-umounts.patch 642 RMD160 821a1bca6eebcf00f5f4b55892e744ad23e25751 SHA1 15d529aeb0c6ed5e6d6e570e7ff349be21de6c57 SHA256 0b89df7d00f4e97d91123f266816864bffdb27036849e32639f8bd5bcce8351e +MD5 409e56a05a768cefbe64923fa61d33e5 files/livecd-tools-1.0.35-umounts.patch 642 +RMD160 821a1bca6eebcf00f5f4b55892e744ad23e25751 files/livecd-tools-1.0.35-umounts.patch 642 +SHA256 0b89df7d00f4e97d91123f266816864bffdb27036849e32639f8bd5bcce8351e files/livecd-tools-1.0.35-umounts.patch 642 DIST livecd-tools-1.0.33.tar.bz2 9833 RMD160 16a1d0b5fa15003099cd6a7f3354686beb1f84ea SHA1 d9423efe477316311ec129c34a5278e419797210 SHA256 0359d5c2c03dbd05ce6107f27c9ab8b4100f2342a8f41e4edb016efb484ce890 DIST livecd-tools-1.0.34.tar.bz2 9820 RMD160 eab0918afeb97c0695b2053974da85aa7f13cbe7 SHA1 130b76016c0c24cdc337dac1d208c2a669d4a50a SHA256 d2488b0c0f1edfd5ed750bfc0597cfc84851dcd82015c24990105b5027e86b3d DIST livecd-tools-1.0.35.tar.bz2 9871 RMD160 bc8f2702746821b8036460213531e030e72e41aa SHA1 72c766bc9956c55006bcf1ed38b572d8d6959efc SHA256 a9968f69056284edcdbb9824c90958a383336ea5a47a281bec57317c6e1c8ab4 @@ -20,14 +24,18 @@ EBUILD livecd-tools-1.0.34.ebuild 1315 RMD160 bee39c9b76197d7cfe6866ed341a4172fc MD5 a06e9744612443482b20c9a35d18b616 livecd-tools-1.0.34.ebuild 1315 RMD160 bee39c9b76197d7cfe6866ed341a4172fc2a8cd1 livecd-tools-1.0.34.ebuild 1315 SHA256 63c0dbfee4c2eeb9ac8addfad73144db27906f2411412730942eba9910b87df2 livecd-tools-1.0.34.ebuild 1315 +EBUILD livecd-tools-1.0.35-r1.ebuild 1443 RMD160 d743e100440c0456664fb74fe31b4384fd8e80da SHA1 de8e438bb0a0d6b2d8597b97fd938f31f24dd723 SHA256 a430569cb9b2ec26c06e654acbb75c9dd313be857509b485a8ec266be340a89a +MD5 5770a9115025350a8c3caf683df16a79 livecd-tools-1.0.35-r1.ebuild 1443 +RMD160 d743e100440c0456664fb74fe31b4384fd8e80da livecd-tools-1.0.35-r1.ebuild 1443 +SHA256 a430569cb9b2ec26c06e654acbb75c9dd313be857509b485a8ec266be340a89a livecd-tools-1.0.35-r1.ebuild 1443 EBUILD livecd-tools-1.0.35.ebuild 1315 RMD160 922e8e225a76580e090fb31def2768b294848425 SHA1 f76c3767d6e19749d38659b5d87ad364c2de9c5b SHA256 87e65a7217f11f3288d110cf2ef0e5e4c8603304cb77cc379319b06800fcc6c8 MD5 23f7a6057c907a052df1e72c30eb28e7 livecd-tools-1.0.35.ebuild 1315 RMD160 922e8e225a76580e090fb31def2768b294848425 livecd-tools-1.0.35.ebuild 1315 SHA256 87e65a7217f11f3288d110cf2ef0e5e4c8603304cb77cc379319b06800fcc6c8 livecd-tools-1.0.35.ebuild 1315 -MISC ChangeLog 17004 RMD160 e442a0dc6e8db55747ddcd16c6c2ace95ba2343a SHA1 feb11fdaf69033bda5aab4f93cda68c37048ec1f SHA256 810b8884daf41f1dc72346a54a28347e265d2dd2b4472f5ed0ac28826bf0885d -MD5 9c8306a791a5fb07d1b7dd7859dd94e7 ChangeLog 17004 -RMD160 e442a0dc6e8db55747ddcd16c6c2ace95ba2343a ChangeLog 17004 -SHA256 810b8884daf41f1dc72346a54a28347e265d2dd2b4472f5ed0ac28826bf0885d ChangeLog 17004 +MISC ChangeLog 17225 RMD160 c588fbd9eba4a8be843efef6d5520b22591f8edb SHA1 718bbbf07da25676cd63b3e4310e7d3db7b7885a SHA256 d44a8faf2e48740c6ac04229a03c27b2e6f068b5227286b7f2242532eb2b3ac8 +MD5 9cd8651bbfb73ec3924bc82b436ca67f ChangeLog 17225 +RMD160 c588fbd9eba4a8be843efef6d5520b22591f8edb ChangeLog 17225 +SHA256 d44a8faf2e48740c6ac04229a03c27b2e6f068b5227286b7f2242532eb2b3ac8 ChangeLog 17225 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159 @@ -41,10 +49,13 @@ SHA256 dba268996c9ae0136217d073287992175529d9a9d527ea5935bd6cf14026f8cc files/di MD5 e3c3ef7d77f3c2bb05d532d7eefbdc79 files/digest-livecd-tools-1.0.35 256 RMD160 60aed1a2a5e5eda6d4c3e93dbfed1ba94d957365 files/digest-livecd-tools-1.0.35 256 SHA256 d45123c62c8338ff8e5ab8522f244d21399bb53b39f2d663b9292f051f92ecef files/digest-livecd-tools-1.0.35 256 +MD5 e3c3ef7d77f3c2bb05d532d7eefbdc79 files/digest-livecd-tools-1.0.35-r1 256 +RMD160 60aed1a2a5e5eda6d4c3e93dbfed1ba94d957365 files/digest-livecd-tools-1.0.35-r1 256 +SHA256 d45123c62c8338ff8e5ab8522f244d21399bb53b39f2d663b9292f051f92ecef files/digest-livecd-tools-1.0.35-r1 256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF+Dt4kT4lNIS36YERAipMAJoCncEks09JeaDWuh8Wchl7ooH4LgCfVjyS -du76ui+LZ7OmskRZ3s89QKA= -=wcvX +iD8DBQFGEsHjkT4lNIS36YERAmWWAKCGEinp6QbgrTyGPjbQcw9b6DogYgCfRArw +e7xYiOsJKPOGeiSgJkt5WPU= +=bgoq -----END PGP SIGNATURE----- diff --git a/app-misc/livecd-tools/files/digest-livecd-tools-1.0.35-r1 b/app-misc/livecd-tools/files/digest-livecd-tools-1.0.35-r1 new file mode 100644 index 000000000000..4c3ea4da64b4 --- /dev/null +++ b/app-misc/livecd-tools/files/digest-livecd-tools-1.0.35-r1 @@ -0,0 +1,3 @@ +MD5 267e50c66bb984aba29e4a3a8317d81d livecd-tools-1.0.35.tar.bz2 9871 +RMD160 bc8f2702746821b8036460213531e030e72e41aa livecd-tools-1.0.35.tar.bz2 9871 +SHA256 a9968f69056284edcdbb9824c90958a383336ea5a47a281bec57317c6e1c8ab4 livecd-tools-1.0.35.tar.bz2 9871 diff --git a/app-misc/livecd-tools/files/livecd-tools-1.0.35-umounts.patch b/app-misc/livecd-tools/files/livecd-tools-1.0.35-umounts.patch new file mode 100644 index 000000000000..efd779918d04 --- /dev/null +++ b/app-misc/livecd-tools/files/livecd-tools-1.0.35-umounts.patch @@ -0,0 +1,20 @@ +Index: livecd-functions.sh +=================================================================== +--- livecd-functions.sh (revision 126) ++++ livecd-functions.sh (working copy) +@@ -497,11 +497,13 @@ + case "${x}" in + cdroot) + CDBOOT="yes" +- export CDBOOT ++ RC_NO_UMOUNTS="^(/|/dev|/dev/pts|/lib/rcscripts/init.d|/proc|/proc/.*|/sys|/mnt/livecd|/newroot)$" ++ export CDBOOT RC_NO_UMOUNTS + ;; + cdroot\=*) + CDBOOT="yes" +- export CDBOOT ++ RC_NO_UMOUNTS="^(/|/dev|/dev/pts|/lib/rcscripts/init.d|/proc|/proc/.*|/sys|/mnt/livecd|/newroot)$" ++ export CDBOOT RC_NO_UMOUNTS + ;; + console\=*) + local live_console diff --git a/app-misc/livecd-tools/livecd-tools-1.0.35-r1.ebuild b/app-misc/livecd-tools/livecd-tools-1.0.35-r1.ebuild new file mode 100644 index 000000000000..a8d30696841a --- /dev/null +++ b/app-misc/livecd-tools/livecd-tools-1.0.35-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-1.0.35-r1.ebuild,v 1.1 2007/04/03 21:06:38 wolf31o2 Exp $ + +inherit eutils + +DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware" +HOMEPAGE="http://www.gentoo.org" +SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +#KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86" +IUSE="opengl X" + +OPENGL_DEPEND="virtual/opengl + x11-misc/mkxf86config + || ( + app-admin/eselect-opengl + >=x11-base/opengl-update-2.2.1 )" + +RDEPEND="dev-util/dialog + sys-apps/pciutils + sys-apps/gawk + alpha? ( opengl? ( ${OPENGL_DEPEND} ) + X? ( >=x11-misc/mkxf86config-0.9.7 ) ) + amd64? ( opengl? ( ${OPENGL_DEPEND} ) + X? ( >=x11-misc/mkxf86config-0.9.2 ) ) + x86? ( opengl? ( ${OPENGL_DEPEND} ) + X? ( x11-misc/mkxf86config ) ) + ppc? ( opengl? ( ${OPENGL_DEPEND} ) + X? ( >=x11-misc/mkxf86config-0.9.7 ) )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-umounts.patch +} + +src_install() { + doinitd autoconfig + newinitd spind.init spind + if use x86 || use amd64 || use ppc + then + if use opengl + then + dosbin x-setup openglify + newinitd x-setup.init x-setup + fi + fi + dosbin net-setup spind + into / + dobin bashlogin + dosbin livecd-functions.sh +}