From: Jeremy Huddleston Date: Fri, 14 Jan 2005 15:12:10 +0000 (+0000) Subject: Whitespace cleanup and touch libsandbox.so in the multilib loop to make the Makefile... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7aaf3e2e1dd53ed65607eaa617f382f3ac3a4b52;p=gentoo.git Whitespace cleanup and touch libsandbox.so in the multilib loop to make the Makefile not update it. Package-Manager: portage-2.0.51-r12 --- diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 921217bf1ea6..379778669fce 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,9 +4,9 @@ Hash: SHA1 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221 MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411 MD5 838be491686bbc8355f44e91020e425c portage-2.0.51-r3.ebuild 12549 -MD5 9a5354e137c41471c03e50fa1288f99f portage-2.0.51-r12.ebuild 13272 -MD5 741d5ea32d4b3a6bf4e8dc8f7c78e43f portage-2.0.51-r11.ebuild 13272 -MD5 d84660d651e2621b448cf70f7bfa2023 portage-2.0.51-r10.ebuild 13272 +MD5 1f574fe53932151d92feb29286ec1115 portage-2.0.51-r12.ebuild 13291 +MD5 a2f8e45c527bbc7a6e4d464c236a4b65 portage-2.0.51-r11.ebuild 13291 +MD5 0b4e04de236db5195da59c1ee2a29472 portage-2.0.51-r10.ebuild 13291 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70 MD5 ded45fee9effe9096a69c8be02263a7a files/digest-portage-2.0.51-r12 71 @@ -16,7 +16,7 @@ MD5 4db139ef78ff65c537654f5f7e512dfd files/digest-portage-2.0.51-r10 71 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB59gdArHZZzCEUG0RAoSIAJ99AT8Hgja/xcohUeza+Wk4CxnmGwCfTxbY -8+s5Ec3ZwQUYZbums9IJ190= -=7/32 +iD8DBQFB5+FmArHZZzCEUG0RAqAIAJ4rcHUcXTnfOEaxtQAYdGURH2QgUACcCL1U +CvNO5myMZNa/7PlkEdnKrFg= +=DWDE -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.0.51-r10.ebuild b/sys-apps/portage/portage-2.0.51-r10.ebuild index b2a4f6d75aab..6987c7f2f54f 100644 --- a/sys-apps/portage/portage-2.0.51-r10.ebuild +++ b/sys-apps/portage/portage-2.0.51-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r10.ebuild,v 1.5 2005/01/14 14:32:51 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r10.ebuild,v 1.6 2005/01/14 15:12:10 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -137,16 +137,17 @@ src_install() { OABI="${ABI}" for ABI in ${MULTILIB_ABIS}; do cp libsandbox.so.${ABI} libsandbox.so + touch libsandbox.so make DESTDIR="${D}" install || \ die "Failed to install sandbox" if [ "$(get_libdir)" = "lib" ]; then - mv ${D}/lib/libsandbox.so ${D}/lib/libsandbox.so.real + mv ${D}/lib/libsandbox.so ${D}/lib/libsandbox.so.lib else dodir /$(get_libdir) mv ${D}/lib/libsandbox.so ${D}/$(get_libdir) fi done - [ -f "${D}/lib/libsandbox.so.real" ] && mv ${D}/lib/libsandbox.so.real ${D}/lib/libsandbox.so + [ -f "${D}/lib/libsandbox.so.lib" ] && mv ${D}/lib/libsandbox.so.lib ${D}/lib/libsandbox.so ABI="${OABI}" elif [ "${ARCH}" == "amd64" -a -z "${MULTILIB_ABIS}" ]; then check_multilib diff --git a/sys-apps/portage/portage-2.0.51-r11.ebuild b/sys-apps/portage/portage-2.0.51-r11.ebuild index 738078d65563..5dd301c2d1d1 100644 --- a/sys-apps/portage/portage-2.0.51-r11.ebuild +++ b/sys-apps/portage/portage-2.0.51-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r11.ebuild,v 1.2 2005/01/14 14:32:51 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r11.ebuild,v 1.3 2005/01/14 15:12:10 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -137,16 +137,17 @@ src_install() { OABI="${ABI}" for ABI in ${MULTILIB_ABIS}; do cp libsandbox.so.${ABI} libsandbox.so + touch libsandbox.so make DESTDIR="${D}" install || \ die "Failed to install sandbox" if [ "$(get_libdir)" = "lib" ]; then - mv ${D}/lib/libsandbox.so ${D}/lib/libsandbox.so.real + mv ${D}/lib/libsandbox.so ${D}/lib/libsandbox.so.lib else dodir /$(get_libdir) mv ${D}/lib/libsandbox.so ${D}/$(get_libdir) fi done - [ -f "${D}/lib/libsandbox.so.real" ] && mv ${D}/lib/libsandbox.so.real ${D}/lib/libsandbox.so + [ -f "${D}/lib/libsandbox.so.lib" ] && mv ${D}/lib/libsandbox.so.lib ${D}/lib/libsandbox.so ABI="${OABI}" elif [ "${ARCH}" == "amd64" -a -z "${MULTILIB_ABIS}" ]; then check_multilib diff --git a/sys-apps/portage/portage-2.0.51-r12.ebuild b/sys-apps/portage/portage-2.0.51-r12.ebuild index 50859caf2007..2aa63db76358 100644 --- a/sys-apps/portage/portage-2.0.51-r12.ebuild +++ b/sys-apps/portage/portage-2.0.51-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r12.ebuild,v 1.2 2005/01/14 14:32:51 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r12.ebuild,v 1.3 2005/01/14 15:12:10 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -137,16 +137,17 @@ src_install() { OABI="${ABI}" for ABI in ${MULTILIB_ABIS}; do cp libsandbox.so.${ABI} libsandbox.so + touch libsandbox.so make DESTDIR="${D}" install || \ die "Failed to install sandbox" if [ "$(get_libdir)" = "lib" ]; then - mv ${D}/lib/libsandbox.so ${D}/lib/libsandbox.so.real + mv ${D}/lib/libsandbox.so ${D}/lib/libsandbox.so.lib else dodir /$(get_libdir) mv ${D}/lib/libsandbox.so ${D}/$(get_libdir) fi done - [ -f "${D}/lib/libsandbox.so.real" ] && mv ${D}/lib/libsandbox.so.real ${D}/lib/libsandbox.so + [ -f "${D}/lib/libsandbox.so.lib" ] && mv ${D}/lib/libsandbox.so.lib ${D}/lib/libsandbox.so ABI="${OABI}" elif [ "${ARCH}" == "amd64" -a -z "${MULTILIB_ABIS}" ]; then check_multilib