diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/Manifest deleted file mode 100644 index 64b6a7e03d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST sqlite-3.6.19.tar.gz 2942005 RMD160 119db76399eca04f21051c6ff156ccbb0c8d35b5 SHA1 1f85a324edfb42ec00bb6dbbec5a178346c950ee SHA256 7d8649c44fb97b874aa59144faaeb2356ec1fc6a8a7baa1d16e9ff5f1e097003 -DIST sqlite3.h-3.6.19.bz2 55962 RMD160 22315fc99b41b4aea0a437da82db269a81f38943 SHA1 c1d8588c3746da8c870202ac5f21d8e4164500e1 SHA256 29b5c53b260384075b2ca819ae52ee415bd968ea51d2774782da0342385b1e09 -DIST sqlite_docs_3_6_19.zip 2429959 RMD160 c210fa6c9d09e531d8679be55585c42c233042b2 SHA1 418aa0066ca64e7157d49c868d63107eadc073e0 SHA256 65e198b7dbaba193ecc4350666402fa20a46b1f3e4dd7fa3403fbb4ad15e906f diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch deleted file mode 100644 index a3e0fadf8e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch +++ /dev/null @@ -1,25 +0,0 @@ -http://www.sqlite.org/cvstrac/tktview?tn=3951 - ---- test/tkt3922.test -+++ test/tkt3922.test -@@ -36,20 +36,6 @@ - } - } {-1 integer} - } --do_test tkt3922.2 { -- execsql { -- DELETE FROM t1; -- INSERT INTO t1 VALUES('-9223372036854775809'); -- SELECT a, typeof(a) FROM t1; -- } --} {-9.22337203685478e+18 real} --do_test tkt3922.3 { -- execsql { -- DELETE FROM t1; -- INSERT INTO t1 VALUES('-9223372036854776832'); -- SELECT a, typeof(a) FROM t1; -- } --} {-9.22337203685478e+18 real} - do_test tkt3922.4 { - execsql { - DELETE FROM t1; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/sqlite-3.6.19.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/sqlite-3.6.19.ebuild deleted file mode 100644 index e47d0d7da0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/sqlite/sqlite-3.6.19.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.18.ebuild,v 1.2 2009/09/18 11:34:58 arfrever Exp $ - -EAPI="2" - -inherit eutils flag-o-matic multilib versionator - -DESCRIPTION="an SQL Database Engine in a C Library" -HOMEPAGE="http://www.sqlite.org/" -DOC_BASE="$(get_version_component_range 1-3)" -DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})" -SRC_URI="http://www.sqlite.org/${P}.tar.gz - doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip ) - !tcl? ( mirror://gentoo/sqlite3.h-${PV}.bz2 )" - -LICENSE="as-is" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="debug doc icu +readline soundex tcl +threadsafe" -RESTRICT="!tcl? ( test )" - -RDEPEND="icu? ( dev-libs/icu ) - readline? ( sys-libs/readline ) - tcl? ( dev-lang/tcl )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" - -pkg_setup() { - if ! use tcl; then - ewarn "Installation of SQLite with \"tcl\" USE flag enabled provides more (TCL-unrelated) functionality." - - if use icu; then - ewarn "Support for ICU is enabled only when \"tcl\" USE flag is enabled." - fi - - ebeep 1 - fi -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.6.16-tkt3922.test.patch" - - epunt_cxx -} - -src_configure() { - # Support column metadata, bug #266651 - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA - - # Support R-trees, bug #257646 - # Avoid "./.libs/libsqlite3.so: undefined reference to `sqlite3RtreeInit'" during non-amalgamation building. - if use tcl; then - append-cppflags -DSQLITE_ENABLE_RTREE - fi - - if use icu && use tcl; then - append-cppflags -DSQLITE_ENABLE_ICU - sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi - - # Support soundex, bug #143794 - use soundex && append-cppflags -DSQLITE_SOUNDEX - - econf \ - $(use_enable debug) \ - $(use_enable readline) \ - $(use_enable threadsafe) \ - $(use_enable threadsafe cross-thread-connections) \ - $(use_enable tcl) -} - -src_compile() { - use tcl || cp "${WORKDIR}/sqlite3.h-${PV}" sqlite3.h - emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed" -} - -src_test() { - if [[ "${EUID}" -ne "0" ]]; then - local test=test - use debug && test=fulltest - emake ${test} || die "some test(s) failed" - else - ewarn "The userpriv feature must be enabled to run tests." - eerror "Testsuite will not be run." - fi - - if ! use tcl; then - ewarn "You must enable the tcl USE flag if you want to run the testsuite." - eerror "Testsuite will not be run." - fi -} - -src_install() { - emake \ - DESTDIR="${D}" \ - TCLLIBDIR="/usr/$(get_libdir)/${P}" \ - install \ - || die "emake install failed" - - doman sqlite3.1 || die "doman sqlite3.1 failed" - - if use doc; then - # Naming scheme changes randomly between - and _ in releases - # http://www.sqlite.org/cvstrac/tktview?tn=3523 - dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die "dohtml failed" - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/files/Fix-candidates-list-update-problem.path b/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/files/Fix-candidates-list-update-problem.path deleted file mode 100644 index 40cd85d49c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/files/Fix-candidates-list-update-problem.path +++ /dev/null @@ -1,83 +0,0 @@ ---- src/input.c 2011/02/14 04:59:22 1.154 -+++ src/input.c 2011/03/09 05:45:49 1.155 -@@ -3004,9 +3004,6 @@ - take_action_list (MInputContext *ic, MPlist *action_list) - { - MInputContextInfo *ic_info = (MInputContextInfo *) ic->info; -- MPlist *candidate_list = ic->candidate_list; -- int candidate_index = ic->candidate_index; -- int candidate_show = ic->candidate_show; - MTextProperty *prop; - - MPLIST_DO (action_list, action_list) -@@ -3480,31 +3477,6 @@ - }; - } - } -- -- if (ic->candidate_list) -- { -- M17N_OBJECT_UNREF (ic->candidate_list); -- ic->candidate_list = NULL; -- } -- if (ic->cursor_pos > 0 -- && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1, -- Mcandidate_list))) -- { -- ic->candidate_list = mtext_property_value (prop); -- M17N_OBJECT_REF (ic->candidate_list); -- ic->candidate_index -- = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1, -- Mcandidate_index); -- ic->candidate_from = mtext_property_start (prop); -- ic->candidate_to = mtext_property_end (prop); -- } -- -- if (candidate_list != ic->candidate_list) -- ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED; -- if (candidate_index != ic->candidate_index) -- ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED; -- if (candidate_show != ic->candidate_show) -- ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED; - return 0; - } - -@@ -3914,7 +3886,37 @@ - ic_info->key_unhandled = 0; - - do { -- if (handle_key (ic) < 0) -+ MPlist *candidate_list = ic->candidate_list; -+ int candidate_index = ic->candidate_index; -+ int candidate_show = ic->candidate_show; -+ MTextProperty *prop; -+ int result = handle_key (ic); -+ -+ if (ic->candidate_list) -+ { -+ M17N_OBJECT_UNREF (ic->candidate_list); -+ ic->candidate_list = NULL; -+ } -+ if (ic->cursor_pos > 0 -+ && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1, -+ Mcandidate_list))) -+ { -+ ic->candidate_list = mtext_property_value (prop); -+ M17N_OBJECT_REF (ic->candidate_list); -+ ic->candidate_index -+ = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1, -+ Mcandidate_index); -+ ic->candidate_from = mtext_property_start (prop); -+ ic->candidate_to = mtext_property_end (prop); -+ } -+ if (candidate_list != ic->candidate_list) -+ ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED; -+ if (candidate_index != ic->candidate_index) -+ ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED; -+ if (candidate_show != ic->candidate_show) -+ ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED; -+ -+ if (result < 0) - { - /* KEY was not handled. Delete it from the current key sequence. */ - if (ic_info->used > 0) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/m17n-lib-1.6.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/m17n-lib-1.6.1-r1.ebuild deleted file mode 100644 index 012c0f59c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/m17n-lib/m17n-lib-1.6.1-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit flag-o-matic libtool - -DESCRIPTION="Multilingual Library for Unix/Linux" -HOMEPAGE="http://www.m17n.org/m17n-lib/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" -IUSE="" - -RDEPEND=">=dev-db/m17n-db-${PV} - dev-libs/libxml2" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/Fix-candidates-list-update-problem.path - elibtoolize -} - -src_configure() { - append-flags -fPIC - - # The configure script warns that the --without-gui option is an - # unrecognized option, but it's not true. Actually, the "unrecognized" - # option effectively removes almost all optional modules of m17n-lib - # that we don't use (namely X11, Xaw, fribidi, freetype, xft2, and - # fontconfig modules). And as far as I know, there is no way to disable - # these modules except the --without-gui option. Note that the X11 and - # freetype modules in m17n-lib-1.6.1 does not compile on Chrome OS - # since they are not cross-compile friendly. - econf --without-gui || die -} - -src_compile() { - emake -j1 || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog NEWS README TODO || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords index 977ac534a3..df05b7e843 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords @@ -24,7 +24,7 @@ =dev-libs/libffi-3.0.9-r2 amd64 arm x86 =dev-libs/libgpg-error-1.10-r1 amd64 arm x86 =dev-libs/libp11-0.2.7 amd64 arm x86 -=dev-libs/m17n-lib-1.6.1-r1 amd64 arm x86 +=dev-libs/m17n-lib-1.6.4 amd64 arm x86 =dev-libs/protobuf-2.2.0 amd64 arm x86 =dev-libs/libusb-1.0.6 amd64 arm x86 =dev-python/numpy-1.4.0 amd64 arm x86