From 1c964028f07842504a7f3a97576f6020120df74a Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 6 Apr 2015 13:03:56 -0700 Subject: [PATCH] libchromeos: remove, no longer used --- .../libchromeos-0.0.1-preserve-path.patch | 13 --- .../libchromeos/libchromeos-0.0.1-r152.ebuild | 88 ------------------ .../libchromeos/libchromeos-0.0.1-r160.ebuild | 91 ------------------- .../libchromeos/libchromeos-9999.ebuild | 85 ----------------- .../coreos-base/libchromeos-0.0.1-r152 | 12 --- .../coreos-base/libchromeos-0.0.1-r160 | 12 --- .../md5-cache/coreos-base/libchromeos-9999 | 12 --- 7 files changed, 313 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r152 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r160 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-9999 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch deleted file mode 100644 index 29b9c6208f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index 11219ed..41d12a6 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -31,7 +31,7 @@ def common_env(): - env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) - - # Fix issue with scons not passing some vars through the environment. -- for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'): -+ for key in Split('PATH PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'): - if os.environ.has_key(key): - env['ENV'][key] = os.environ[key] - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild deleted file mode 100644 index 372f32eccb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="f4ecd4c82cf85c0c34bbd6db1af645758491dc36" -CROS_WORKON_TREE="0e93b9386777f1606fb731bee338820c54d6b9b9" -CROS_WORKON_PROJECT="chromiumos/platform/libchromeos" -CROS_WORKON_LOCALNAME="../common" # FIXME: HACK - -LIBCHROME_VERS=( 125070 ) - -inherit toolchain-funcs cros-debug cros-workon scons-utils - -DESCRIPTION="Chrome OS base library." -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="cros_host test" - -LIBCHROME_DEPEND=$( - printf \ - 'coreos-base/libchrome:%s[cros-debug=] ' \ - ${LIBCHROME_VERS[@]} -) -RDEPEND="${LIBCHROME_DEPEND} - dev-libs/dbus-c++ - dev-libs/dbus-glib - dev-libs/openssl - dev-libs/protobuf" - -DEPEND="${RDEPEND} - coreos-base/protofiles - test? ( dev-cpp/gtest ) - cros_host? ( dev-util/scons )" - -cr_scons() { - local v=$1; shift - BASE_VER=${v} escons -C ${v} -Y "${S}" "$@" -} - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - export CCFLAGS="$CFLAGS" - - local v - mkdir -p ${LIBCHROME_VERS[@]} - for v in ${LIBCHROME_VERS[@]} ; do - cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so - done -} - -src_test() { - local v - for v in ${LIBCHROME_VERS[@]} ; do - cr_scons ${v} unittests libpolicy_unittest - if ! use x86 && ! use amd64 ; then - ewarn "Skipping unit tests on non-x86 platform" - else - ./${v}/unittests || die "libchromeos-${v} failed" - ./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed" - fi - done -} - -src_install() { - local v - insinto /usr/$(get_libdir)/pkgconfig - for v in ${LIBCHROME_VERS[@]} ; do - dolib.so ${v}/lib{chromeos,policy}*-${v}.so - doins ${v}/libchromeos-${v}.pc - done - - insinto /usr/include/chromeos - doins chromeos/*.h - - insinto /usr/include/chromeos/dbus - doins chromeos/dbus/*.h - - insinto /usr/include/chromeos/glib - doins chromeos/glib/*.h - - insinto /usr/include/policy - doins chromeos/policy/*.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild deleted file mode 100644 index f04ec68359..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="6e8f24e5f10aeba2feb9d72a49f276fc0f2ed7de" -CROS_WORKON_TREE="4677180b651268e80a28763a89399281ec778d46" -CROS_WORKON_PROJECT="chromiumos/platform/libchromeos" - -LIBCHROME_VERS=( 180609 ) - -inherit eutils toolchain-funcs cros-debug cros-workon scons-utils - -DESCRIPTION="Chrome OS base library." -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="cros_host test" - -LIBCHROME_DEPEND=$( - printf \ - 'coreos-base/libchrome:%s[cros-debug=] ' \ - ${LIBCHROME_VERS[@]} -) -RDEPEND="${LIBCHROME_DEPEND} - dev-libs/dbus-c++ - dev-libs/dbus-glib - dev-libs/openssl - dev-libs/protobuf" - -DEPEND="${RDEPEND} - coreos-base/protofiles - test? ( dev-cpp/gtest ) - cros_host? ( dev-util/scons )" - -cr_scons() { - local v=$1; shift - BASE_VER=${v} escons -C ${v} -Y "${S}" "$@" -} - -src_prepare() { - epatch "${FILESDIR}/${P}-preserve-path.patch" -} - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - export CCFLAGS="$CFLAGS" - - local v - mkdir -p ${LIBCHROME_VERS[@]} - for v in ${LIBCHROME_VERS[@]} ; do - cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so - done -} - -src_test() { - local v - for v in ${LIBCHROME_VERS[@]} ; do - cr_scons ${v} unittests libpolicy_unittest - if ! use x86 && ! use amd64 ; then - ewarn "Skipping unit tests on non-x86 platform" - else - ./${v}/unittests || die "libchromeos-${v} failed" - ./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed" - fi - done -} - -src_install() { - local v - insinto /usr/$(get_libdir)/pkgconfig - for v in ${LIBCHROME_VERS[@]} ; do - dolib.so ${v}/lib{chromeos,policy}*-${v}.so - doins ${v}/libchromeos-${v}.pc - done - - insinto /usr/include/chromeos - doins chromeos/*.h - - insinto /usr/include/chromeos/dbus - doins chromeos/dbus/*.h - - insinto /usr/include/chromeos/glib - doins chromeos/glib/*.h - - insinto /usr/include/policy - doins chromeos/policy/*.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild deleted file mode 100644 index 6dfdc2806e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_PROJECT="chromiumos/platform/libchromeos" - -LIBCHROME_VERS=( 180609 ) - -inherit toolchain-funcs cros-debug cros-workon scons-utils - -DESCRIPTION="Chrome OS base library." -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="cros_host test" - -LIBCHROME_DEPEND=$( - printf \ - 'coreos-base/libchrome:%s[cros-debug=] ' \ - ${LIBCHROME_VERS[@]} -) -RDEPEND="${LIBCHROME_DEPEND} - dev-libs/dbus-c++ - dev-libs/dbus-glib - dev-libs/openssl - dev-libs/protobuf" - -DEPEND="${RDEPEND} - coreos-base/protofiles - test? ( dev-cpp/gtest ) - cros_host? ( dev-util/scons )" - -cr_scons() { - local v=$1; shift - BASE_VER=${v} escons -C ${v} -Y "${S}" "$@" -} - -src_compile() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - export CCFLAGS="$CFLAGS" - - local v - mkdir -p ${LIBCHROME_VERS[@]} - for v in ${LIBCHROME_VERS[@]} ; do - cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so - done -} - -src_test() { - local v - for v in ${LIBCHROME_VERS[@]} ; do - cr_scons ${v} unittests libpolicy_unittest - if ! use x86 && ! use amd64 ; then - ewarn "Skipping unit tests on non-x86 platform" - else - ./${v}/unittests || die "libchromeos-${v} failed" - ./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed" - fi - done -} - -src_install() { - local v - insinto /usr/$(get_libdir)/pkgconfig - for v in ${LIBCHROME_VERS[@]} ; do - dolib.so ${v}/lib{chromeos,policy}*-${v}.so - doins ${v}/libchromeos-${v}.pc - done - - insinto /usr/include/chromeos - doins chromeos/*.h - - insinto /usr/include/chromeos/dbus - doins chromeos/dbus/*.h - - insinto /usr/include/chromeos/glib - doins chromeos/glib/*.h - - insinto /usr/include/policy - doins chromeos/policy/*.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r152 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r152 deleted file mode 100644 index 35cc75a01d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r152 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile info install setup test unpack -DEPEND=coreos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf coreos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons -DESCRIPTION=Chrome OS base library. -EAPI=4 -HOMEPAGE=http://www.chromium.org/ -IUSE=cros_host test cros-debug cros_workon_tree_0e93b9386777f1606fb731bee338820c54d6b9b9 profiling -KEYWORDS=amd64 arm x86 -LICENSE=BSD -RDEPEND=coreos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf -SLOT=0 -_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 371c4d0af591fe21f1a019af07137224 eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 git-2 e28f0d8a9b321431b1e699782851b827 multilib 3bf24e6abb9b76d9f6c20600f0b716bf scons-utils 988e24b9e2e4642189b4e97c03e5ae71 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=c183f68464e71f403eff46203368228f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r160 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r160 deleted file mode 100644 index bb4cfa4e81..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r160 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile info install prepare setup test unpack -DEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf coreos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons -DESCRIPTION=Chrome OS base library. -EAPI=4 -HOMEPAGE=http://www.chromium.org/ -IUSE=cros_host test cros-debug cros_workon_tree_4677180b651268e80a28763a89399281ec778d46 profiling -KEYWORDS=amd64 arm x86 -LICENSE=BSD -RDEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf -SLOT=0 -_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 371c4d0af591fe21f1a019af07137224 eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 git-2 e28f0d8a9b321431b1e699782851b827 multilib 3bf24e6abb9b76d9f6c20600f0b716bf scons-utils 988e24b9e2e4642189b4e97c03e5ae71 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=1662b43d9a80cdb8d10cd9480d56afed diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-9999 deleted file mode 100644 index 2087b5c1a4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile info install setup test unpack -DEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf coreos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons -DESCRIPTION=Chrome OS base library. -EAPI=4 -HOMEPAGE=http://www.chromium.org/ -IUSE=cros_host test cros-debug cros_workon_tree_* profiling -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=BSD -RDEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf -SLOT=0 -_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 371c4d0af591fe21f1a019af07137224 eutils 6faef4c127028ccbba3a11400d24ae34 flag-o-matic eda1c0b5ba85b3eeb555a071d69eb819 git-2 e28f0d8a9b321431b1e699782851b827 multilib 3bf24e6abb9b76d9f6c20600f0b716bf scons-utils 988e24b9e2e4642189b4e97c03e5ae71 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=209e3164f9488818e256e7b393ff393b