diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r191.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r192.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r191.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r192.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index f732359b2f..afc29f9d0f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -60,10 +60,7 @@ RDEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons - dev-vcs/cvs >=dev-vcs/git-1.7.2 - dev-vcs/mercurial - dev-vcs/subversion[-dso] net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/Manifest deleted file mode 100644 index 4c9f0298f2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/47_mod_dav_svn.conf b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/47_mod_dav_svn.conf deleted file mode 100644 index 52d08b7ab5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/47_mod_dav_svn.conf +++ /dev/null @@ -1,16 +0,0 @@ - -LoadModule dav_svn_module modules/mod_dav_svn.so - -LoadModule authz_svn_module modules/mod_authz_svn.so - - -# Example configuration: -# -# DAV svn -# SVNPath ${SVN_REPOS_LOC}/repos -# AuthType Basic -# AuthName "Subversion repository" -# AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers -# Require valid-user -# - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.4-interix.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.4-interix.patch deleted file mode 100644 index 53ef6960c9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.4-interix.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:22:36 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:52:31 +0100 -@@ -49,6 +49,11 @@ - # endif - #endif - -+// This is bad, but better than nothing ;) -+#if defined(__INTERIX) -+# define strtoll strtol -+#endif -+ - - - #if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK) -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c subversion-1.5.4/subversion/bindings/swig/perl/native/core.c ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:22:37 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:53:40 +0100 -@@ -1733,7 +1733,10 @@ - # endif - #endif - -- -+#ifdef __INTERIX -+# define strtoull strtoul -+# define strtoll strtol -+#endif - - SWIGINTERN int - SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val) -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:22:37 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:54:17 +0100 -@@ -1872,6 +1872,10 @@ - #endif - - -+#ifdef __INTERIX -+# define strtoull strtoul -+# define strtoll strtol -+#endif - - SWIGINTERN int - SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val) -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:22:37 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:54:28 +0100 -@@ -1745,6 +1745,10 @@ - #endif - - -+#ifdef __INTERIX -+# define strtoull strtoul -+# define strtoll strtol -+#endif - - SWIGINTERN int - SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val) -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:22:37 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:54:41 +0100 -@@ -1818,6 +1818,10 @@ - #endif - - -+#ifdef __INTERIX -+# define strtoull strtoul -+# define strtoll strtol -+#endif - - SWIGINTERN int - SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val) -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:22:37 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:54:52 +0100 -@@ -1661,6 +1661,10 @@ - # endif - #endif - -+#ifdef __INTERIX -+# define strtoull strtoul -+# define strtoll strtol -+#endif - - SWIGINTERN int - SWIG_AsVal_double SWIG_PERL_DECL_ARGS_2(SV *obj, double *val) -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:22:37 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:55:05 +0100 -@@ -1792,6 +1792,10 @@ - #endif - - -+#ifdef __INTERIX -+# define strtoull strtoul -+# define strtoll strtol -+#endif - - SWIGINTERN int - SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val) -diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c ---- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:22:37 +0100 -+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:55:17 +0100 -@@ -1816,6 +1816,10 @@ - #endif - - -+#ifdef __INTERIX -+# define strtoull strtoul -+# define strtoll strtol -+#endif - - SWIGINTERN int - SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch deleted file mode 100644 index 69a4355f17..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch +++ /dev/null @@ -1,21 +0,0 @@ -On AIX, load shared libraries even when created with full aix-soname support: -http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html -http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html -Once there is an agreement on that, this patch eventually is for upstream too. - ---- a/subversion/libsvn_ra/ra_loader.c -+++ b/subversion/libsvn_ra/ra_loader.c -@@ -164,6 +164,13 @@ - - /* find/load the specified library */ - SVN_ERR(svn_dso_load(&dso, libname)); -+#ifdef _AIX -+ if (! dso) { -+ libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0(shr.o)", -+ ra_name, SVN_VER_MAJOR); -+ SVN_ERR(svn_dso_load(&dso, libname)); -+ } -+#endif - if (! dso) - return SVN_NO_ERROR; - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch deleted file mode 100644 index 80e5563672..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- subversion-1.8.0/subversion/libsvn_ra/ra_loader.c -+++ subversion-1.8.0/subversion/libsvn_ra/ra_loader.c -@@ -141,8 +141,13 @@ - const char *compat_funcname; - apr_status_t status; - -+#if defined(__hpux) && defined(__hppa) -+ libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.%d", -+ ra_name, SVN_VER_MAJOR, SVN_SOVERSION); -+#else - libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.%d", - ra_name, SVN_VER_MAJOR, SVN_SOVERSION); -+#endif - funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name); - compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name); - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch deleted file mode 100644 index 158c082331..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- subversion-1.8.1/build/ac-macros/berkeley-db.m4 -+++ subversion-1.8.1/build/ac-macros/berkeley-db.m4 -@@ -48,7 +48,7 @@ - AC_ARG_WITH(berkeley-db, [AS_HELP_STRING( - [[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [ - The Subversion Berkeley DB based filesystem library -- requires Berkeley DB $db_version or $db_alt_version. If you -+ requires Berkeley DB $db_version or newer. If you - specify `--without-berkeley-db', that library will - not be built. If you omit the argument of this option - completely, the configure script will use Berkeley DB -@@ -126,35 +126,22 @@ - svn_lib_berkeley_db=no - else - AC_MSG_CHECKING([for availability of Berkeley DB]) -- AC_ARG_ENABLE(bdb6, -- AS_HELP_STRING([--enable-bdb6], -- [Allow building against BDB 6+. -- See --with-berkeley-db for specifying the location of -- the Berkeley DB installation. Using BDB 6 will fail if -- this option is not used.]), -- [enable_bdb6=$enableval],[enable_bdb6=unspecified]) -- -- SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6) -+ SVN_LIB_BERKELEY_DB_TRY($1, $2, $3) - if test "$svn_have_berkeley_db" = "yes"; then - AC_MSG_RESULT([yes]) - svn_lib_berkeley_db=yes - else -- if test "$svn_have_berkeley_db" = "no6"; then -- AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)]) -- # A warning will be printed at the end of configure.ac. -- else -- AC_MSG_RESULT([no]) -- fi -+ AC_MSG_RESULT([no]) - svn_lib_berkeley_db=no - if test "$bdb_status" = "required"; then -- AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.]) -+ AC_MSG_ERROR([Berkeley DB $db_version or newer't found.]) - fi - fi - fi - ]) - - --dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6) -+dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch) - dnl - dnl A subroutine of SVN_LIB_BERKELEY_DB. - dnl -@@ -187,7 +174,6 @@ - svn_check_berkeley_db_major=$1 - svn_check_berkeley_db_minor=$2 - svn_check_berkeley_db_patch=$3 -- enable_bdb6=$4 - - if test -z "$SVN_DB_LIBS"; then - # We pass --dbm-libs here since Debian has modified apu-config not -@@ -245,12 +231,6 @@ - || patch != DB_VERSION_PATCH) - exit (1); - -- /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20 -- and newer are under the AGPL, and we want use of AGPL dependencies to be -- opt-in. */ -- if (major >= 6 && strcmp("$enable_bdb6", "yes")) -- exit(2); -- - /* Run-time check: ensure the library claims to be the correct version. */ - - if (major < $svn_check_berkeley_db_major) -@@ -270,11 +250,7 @@ - } - ]])], - [svn_have_berkeley_db=yes], -- [rc=$? -- svn_have_berkeley_db=no -- if test $rc = 2; then -- svn_have_berkeley_db=no6 -- fi], -+ [svn_have_berkeley_db=no], - [svn_have_berkeley_db=yes] - ) - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch deleted file mode 100644 index 8b07d22ca3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch +++ /dev/null @@ -1,19 +0,0 @@ -With newer versions of javadoc (since JDK-1.8), "make doc-javahl" -reports many errors, causing build failures. Add "-Xdoclint:none" -option to restore old, sloppy behavior. - -Patch created for subversion-1.8.16, should work for other other -versions, too. -See - ---- a/Makefile.in -+++ b/Makefile.in -@@ -650,7 +650,7 @@ - - # Generate API documentation for the JavaHL package. - doc-javahl: -- $(JAVADOC) -d $(abs_builddir)/doc/javadoc \ -+ $(JAVADOC) -Xdoclint:none -d $(abs_builddir)/doc/javadoc \ - -sourcepath $(top_srcdir)/subversion/bindings/javahl/src \ - -link http://java.sun.com/javase/6/docs/api/ \ - org.tigris.subversion.javahl \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch deleted file mode 100644 index bffb43117b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -732,7 +732,7 @@ - extraclean-swig-headers: clean-swig-headers - $(EXTRACLEAN_SWIG_HEADERS) - --$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in -+$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl - ./config.status subversion/bindings/swig/perl/native/Makefile.PL - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd deleted file mode 100644 index 83997ce927..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.confd +++ /dev/null @@ -1,10 +0,0 @@ -# The commented variables in this file are the defaults that are used -# in the init-script. You don't need to uncomment them except to -# customize them to different values. - -# Options for svnserve -#SVNSERVE_OPTS="--root=/var/svn" - -# User and group as which to run svnserve -#SVNSERVE_USER="svn" -#SVNSERVE_GROUP="svnusers" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd3 b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd3 deleted file mode 100644 index a28ce0b478..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd3 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -description="svn server" -pidfile="/var/run/svnserve.pid" -command="/usr/bin/svnserve" -command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}" -command_background="true" -start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}" - -depend() { - need net -} - -start_pre() { - # Ensure that we run from a readable working dir, and that we do not - # lock filesystems when being run from such a location. - cd / -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.xinetd b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.xinetd deleted file mode 100644 index e29f906b50..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.xinetd +++ /dev/null @@ -1,14 +0,0 @@ -service svn -{ - socket_type = stream - wait = no - user = apache - group = apache - umask = 002 - protocol = tcp - log_on_failure += USERID HOST - port = 3690 - server = /usr/bin/svnserve - server_args = -i - disable = yes -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/metadata.xml deleted file mode 100644 index a8dc2a284c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - polynomial-c@gentoo.org - Lars Wendler - - - Build and install Ctypes Python bindings - Enable runtime module search - Install extra scripts (examples, tools, hooks) - Enable http support using net-libs/serf - Enable encrypted storage of passwords with kde-frameworks/kwallet - - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild deleted file mode 100644 index 93644b31be..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild +++ /dev/null @@ -1,514 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby22 ruby21" -DISTUTILS_OPTIONAL=1 -WANT_AUTOMAKE="none" -GENTOO_DEPEND_ON_PERL="no" - -inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single - -MY_P="${P/_/-}" -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax" - -COMMON_DEPEND=" - app-arch/bzip2 - >=dev-db/sqlite-3.7.12 - >=dev-libs/apr-1.3:1 - >=dev-libs/apr-util-1.3:1 - dev-libs/expat - sys-apps/file - sys-libs/zlib - berkdb? ( >=sys-libs/db-4.0.14:= ) - ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) - http? ( >=net-libs/serf-1.3.4 ) - kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - ruby? ( ${RUBY_DEPS} ) - sasl? ( dev-libs/cyrus-sasl )" -RDEPEND="${COMMON_DEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - java? ( >=virtual/jre-1.5 ) - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once -DEPEND="${COMMON_DEPEND} - !!=virtual/jdk-1.5 ) - kwallet? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - test? ( ${PYTHON_DEPS} )" - -REQUIRED_USE=" - ctypes-python? ( ${PYTHON_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - !dso - )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.4-interix.patch - "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch - "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch - "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch - "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch - "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch -) - -want_apache - -pkg_setup() { - if use berkdb ; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]] ; then - if [[ -n "${apu_bdb_version}" ]] ; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then - eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" - eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." - eerror "Aborting to avoid possible run-time crashes." - die "Berkeley DB version mismatch" - fi - fi - - depend.apache_pkg_setup - - java-pkg-opt-2_pkg_setup - - if ! use http ; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling \"http\" USE flag" - echo -ne "\a" - fi - - if use debug ; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E - [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" - - if use ruby ; then - local rbslot - RB_VER="" - for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do - if has_version dev-lang/ruby:${rbslot} ; then - RB_VER="${rbslot/.}" - break - fi - done - [[ -z "${RB_VER}" ]] && die "No useable ruby version found" - fi -} - -src_prepare() { - default - - fperms +x build/transform_libtool_scripts.sh - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - # this bites us in particular on Solaris - sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ - die "/bin/sh is not POSIX shell!" - - # Avoid AC_RUN_IFELSE in MacOS tests. - sed -i \ - -e "s/SVN_LIB_MACHO_ITERATE//g" \ - -e "s/SVN_LIB_MACOS_PLIST//g" \ - -e "s/SVN_LIB_MACOS_KEYCHAIN//g" \ - configure.ac - - eautoconf - elibtoolize - - sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ - -i build-outputs.mk || die "sed failed" - - if use python ; then - # XXX: make python_copy_sources accept path - S=${S}/subversion/bindings/swig/python python_copy_sources - rm -r "${S}"/subversion/bindings/swig/python || die - fi -} - -src_configure() { - local myconf=( - --libdir="${EPREFIX%/}/usr/$(get_libdir)" - $(use_with apache2 apache-libexecdir) - $(use_with apache2 apxs "${APXS}") - $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") - $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") - $(use_enable dso runtime-module-search) - $(use_with gnome-keyring) - $(use_enable java javahl) - $(use_with java jdk "${JAVA_HOME}") - $(use_with kwallet) - $(use_enable nls) - $(use_with sasl) - $(use_with http serf) - --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" - --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" - --disable-experimental-libtool - --without-jikes - --disable-mod-activation - --disable-static - ) - - if use python || use perl || use ruby; then - myconf+=( --with-swig ) - else - myconf+=( --without-swig ) - fi - - if use java ; then - myconf+=( --without-junit ) - fi - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-cygwin*) - # no LD_PRELOAD support, no undefined symbols - myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined ) - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=( --disable-local-library-preloading ) - ;; - *-solaris*) - # need -lintl to link - use nls && append-libs intl - # this breaks installation, on x64 echo replacement is 32-bits - myconf+=( --disable-local-library-preloading ) - ;; - *-mint*) - myconf+=( --enable-all-static --disable-local-library-preloading ) - ;; - *) - # inject LD_PRELOAD entries for easy in-tree development - myconf+=( --enable-local-library-preloading ) - ;; - esac - - #version 1.7.7 again tries to link against the older installed version and fails, when trying to - #compile for x86 on amd64, so workaround this issue again - #check newer versions, if this is still/again needed - myconf+=( --disable-disallowing-of-undefined-references ) - - # for build-time scripts - if use ctypes-python || use python || use test; then - python_setup - fi - - if use python && [[ ${CHOST} == *-darwin* ]] ; then - export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' - export ac_cv_python_compile="$(tc-getCC)" - fi - - # allow overriding Python include directory - ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ - ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ - ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ - econf "${myconf[@]}" -} - -src_compile() { - emake local-all - - if use ctypes-python ; then - # pre-generate .py files - use ctypes-python && emake ctypes-python - - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi - - if use python ; then - swig_py_compile() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - python_export PYTHON_INCLUDEDIR - emake swig-py \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" - } - - # this will give us proper BUILD_DIR for symlinking - BUILD_DIR=python \ - python_foreach_impl swig_py_compile - fi - - if use perl ; then - emake swig-pl - fi - - if use ruby ; then - emake swig-rb - fi - - if use java ; then - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl - fi - - if use extras ; then - emake tools - fi - - if use doc ; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - - if use java; then - emake doc-javahl - fi - fi -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - default - - if use ctypes-python ; then - python_test() { - "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ - || die "ctypes-python tests fail with ${EPYTHON}" - } - - distutils-r1_src_test - fi - - if use python ; then - swig_py_test() { - pushd "${BUILD_DIR}" >/dev/null || die - "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" - popd >/dev/null || die - } - - BUILD_DIR=subversion/bindings/swig/python \ - python_foreach_impl swig_py_test - fi - else - ewarn "The test suite shows errors when there is an older version of" - ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" - ewarn "before running the test suite." - ewarn "Test suite skipped." - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install - - if use ctypes-python ; then - pushd subversion/bindings/ctypes-python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - if use python ; then - swig_py_install() { - local p=subversion/bindings/swig/python - rm -f ${p} || die - ln -s "${BUILD_DIR}" ${p} || die - - emake \ - DESTDIR="${D}" \ - swig_pydir="$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="$(python_get_sitedir)/svn" \ - install-swig-py - } - - BUILD_DIR=python \ - python_foreach_impl swig_py_install - fi - - if use perl ; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl - perl_delete_localpod - find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete - fi - - if use ruby ; then - emake DESTDIR="${D}" install-swig-rb - fi - - if use java ; then - emake DESTDIR="${D}" install-javahl - java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname) - java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar - rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar - fi - - # Install Apache module configuration. - if use apache2 ; then - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - fi - - # Install Bash Completion, bug 43179. - newbashcomp tools/client-side/bash_completion svn - bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} - rm -f tools/client-side/bash_completion - - # Install hot backup script, bug 54304. - newbin tools/backup/hot-backup.py svn-hot-backup - rm -fr tools/backup - - # Install svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd3 svnserve - newconfd "${FILESDIR}"/svnserve.confd svnserve - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - #adjust default user and group with disabled apache2 USE flag, bug 381385 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${ED%/}"/etc/init.d/svnserve || die - use apache2 || sed -e "0,/apache/s//svn/" \ - -e "s:apache:svnusers:" \ - -i "${ED%/}"/etc/xinetd.d/svnserve || die - - # Install documentation. - dodoc CHANGES COMMITTERS README - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install extra files. - if use extras ; then - cat <<- EOF > 80subversion-extras - PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" - ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" - EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die - doins -r tools - fi - - if use doc ; then - docinto html - dodoc -r doc/doxygen/html/* - - if use java ; then - java-pkg_dojavadoc doc/javadoc - fi - fi - - prune_libtool_files --all - - cd "${ED%/}"/usr/share/locale - for i in * ; do - [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; } - done -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -pkg_postinst() { - if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then - ewarn "You upgraded from an older version of Berkeley DB and may experience" - ewarn "problems with your repository. Run the following commands as root to fix it:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -pkg_postrm() { - : -} - -pkg_config() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${SVN_REPOS_LOC}..." - if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2 ; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - fi - chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" - echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" - echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" - echo "to finish the configuration." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 index 0fbaf333bd..66d555148b 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 @@ -4,6 +4,6 @@ EAPI=2 HOMEPAGE=http://src.chromium.org KEYWORDS=amd64 x86 LICENSE=GPL-2 -RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.10 dev-lang/go:1.12 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad +RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.10 dev-lang/go:1.12 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons >=dev-vcs/git-1.7.2 net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad SLOT=0 -_md5_=e24e94498353de8aa459386204a045ee +_md5_=3c966a9fb944f95069e025589093d657 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r191 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r192 similarity index 56% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r191 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r192 index 0fbaf333bd..66d555148b 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r191 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r192 @@ -4,6 +4,6 @@ EAPI=2 HOMEPAGE=http://src.chromium.org KEYWORDS=amd64 x86 LICENSE=GPL-2 -RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.10 dev-lang/go:1.12 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad +RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go:1.6 dev-lang/go:1.7 dev-lang/go:1.8 dev-lang/go:1.10 dev-lang/go:1.12 dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/ctypesgen dev-python/mako sys-devel/bc dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons >=dev-vcs/git-1.7.2 net-misc/google-cloud-sdk sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-fs/squashfs-tools coreos-base/update_engine dev-python/pylint net-misc/openssh net-misc/wget virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad SLOT=0 -_md5_=e24e94498353de8aa459386204a045ee +_md5_=3c966a9fb944f95069e025589093d657 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/subversion-1.9.7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/subversion-1.9.7 deleted file mode 100644 index d052cc233c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/subversion-1.9.7 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test -DEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!=virtual/jdk-1.5 ) kwallet? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) -DESCRIPTION=Advanced version control system -EAPI=6 -HOMEPAGE=http://subversion.apache.org/ -IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=Subversion GPL-2 -RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 ) -REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso ) -SLOT=0 -SRC_URI=mirror://apache/subversion/subversion-1.9.7.tar.bz2 -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb db-use 501a5d0963e0d17f30260023f292ae8e depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 3c52cbe53976e882e4adeaf6bde28de0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b -_md5_=46ae89d812fcf5c4b9e1f397ad652c3a diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index e9505c3915..54781a8dda 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -10,8 +10,7 @@ dev-libs/dbus-glib tools dev-libs/protobuf -python dev-libs/libxml2 -python dev-util/perf tui -doc -dev-vcs/git cvs subversion webdav curl bash-completion -dev-vcs/subversion -dso webdav-serf +dev-vcs/git webdav curl bash-completion # We don't want any driver/hw rendering on the host net-misc/curl kerberos threads net-misc/iputils arping traceroute