From 6270f2518cd3bb2bc2576afac94d28c97ea45dbb Mon Sep 17 00:00:00 2001 From: root Date: Tue, 31 Jan 2012 17:42:45 +0400 Subject: [PATCH] Sync with portage [Tue Jan 31 17:42:45 MSK 2012]. --- dev-db/mysql/Manifest | 3 + dev-db/mysql/mysql-5.1.61.ebuild | 261 ++++++++++++++++++ dev-db/mysql/mysql-5.5.20.ebuild | 129 +++++++++ dev-lang/scala/scala-2.9.1.ebuild | 4 +- dev-libs/libpqxx/Manifest | 1 + .../libpqxx/files/libpqxx-3.1-gcc46.patch | 24 ++ dev-libs/libpqxx/libpqxx-3.1-r3.ebuild | 94 +++++++ dev-php/PEAR-PhpDocumentor/Manifest | 1 + .../PEAR-PhpDocumentor-1.4.4.ebuild | 27 ++ dev-php/propel-generator/Manifest | 1 + .../propel-generator-1.6.4.ebuild | 25 ++ dev-php/propel-runtime/Manifest | 1 + .../propel-runtime-1.6.4.ebuild | 25 ++ dev-php/propel/propel-1.6.4.ebuild | 17 ++ games-puzzle/drod-bin/drod-bin-1.6.6.ebuild | 23 +- kde-base/phonon-kde/phonon-kde-4.6.3.ebuild | 9 +- kde-base/phonon-kde/phonon-kde-4.7.4.ebuild | 7 +- media-gfx/gtkam/Manifest | 1 + .../gtkam-0.1.18-desktop-validation.patch | 15 + media-gfx/gtkam/gtkam-0.1.18.ebuild | 54 ++++ .../linuxtv-dvb-headers-5.3.ebuild | 4 +- metadata/cache/dev-db/mysql-5.1.61 | 22 ++ metadata/cache/dev-db/mysql-5.5.20 | 22 ++ metadata/cache/dev-lang/scala-2.9.1 | 2 +- metadata/cache/dev-libs/libpqxx-3.1-r3 | 22 ++ .../cache/dev-php/PEAR-PhpDocumentor-1.4.4 | 22 ++ metadata/cache/dev-php/propel-1.6.4 | 22 ++ metadata/cache/dev-php/propel-generator-1.6.4 | 22 ++ metadata/cache/dev-php/propel-runtime-1.6.4 | 22 ++ metadata/cache/games-puzzle/drod-bin-1.6.6 | 2 +- metadata/cache/kde-base/phonon-kde-4.6.3 | 6 +- metadata/cache/kde-base/phonon-kde-4.7.4 | 6 +- metadata/cache/media-gfx/gtkam-0.1.18 | 22 ++ .../cache/media-tv/linuxtv-dvb-headers-5.3 | 2 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- profiles/use.desc | 3 +- .../chromium/chromium-17.0.963.46.ebuild | 8 +- 42 files changed, 905 insertions(+), 38 deletions(-) create mode 100644 dev-db/mysql/mysql-5.1.61.ebuild create mode 100644 dev-db/mysql/mysql-5.5.20.ebuild create mode 100644 dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch create mode 100644 dev-libs/libpqxx/libpqxx-3.1-r3.ebuild create mode 100644 dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild create mode 100644 dev-php/propel-generator/propel-generator-1.6.4.ebuild create mode 100644 dev-php/propel-runtime/propel-runtime-1.6.4.ebuild create mode 100644 dev-php/propel/propel-1.6.4.ebuild create mode 100644 media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch create mode 100644 media-gfx/gtkam/gtkam-0.1.18.ebuild create mode 100644 metadata/cache/dev-db/mysql-5.1.61 create mode 100644 metadata/cache/dev-db/mysql-5.5.20 create mode 100644 metadata/cache/dev-libs/libpqxx-3.1-r3 create mode 100644 metadata/cache/dev-php/PEAR-PhpDocumentor-1.4.4 create mode 100644 metadata/cache/dev-php/propel-1.6.4 create mode 100644 metadata/cache/dev-php/propel-generator-1.6.4 create mode 100644 metadata/cache/dev-php/propel-runtime-1.6.4 create mode 100644 metadata/cache/media-gfx/gtkam-0.1.18 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index c42a3429a179..a3a8fb0de5f3 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -9,7 +9,9 @@ DIST mysql-5.1.56.tar.gz 24795624 RMD160 c2ff6eb06d0797d4b56630b783d4ad2d1add142 DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283e SHA1 fcfe037ee6cfd53fe336ef12854e79481bdc6681 SHA256 7944fa56476f44173af4c91ad685a9da5e9d5fa9dea69dafb4b9919df3f3667d DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7 DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7 +DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f +DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e DIST mysql-extras-20070105.tar.bz2 50005 RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb SHA1 7f4dbc3d6c20fe953bf6e936a58343a229398ca0 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 RMD160 d71ed448d9fbe61ecc9e4113bd0a7721e8321acb SHA1 9fd9370193e7038067e11cc8a26bfe4013eb6bac SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb DIST mysql-extras-20100809-0452Z.tar.bz2 1228458 RMD160 baedaa994165ec17cfc31357d91212c8350be310 SHA1 e464adc36d96b76a5c6ac74856060d05ff0bba3d SHA256 2ba39a87dd5ea2c819193d1b25c6e2abbd4506d63c1e8b845846b7b33d64e52b @@ -19,5 +21,6 @@ DIST mysql-extras-20101128-2122Z.tar.bz2 1237793 RMD160 43b536c060d3a1bafa993ec4 DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37 +DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild new file mode 100644 index 000000000000..7e9d80ff0164 --- /dev/null +++ b/dev-db/mysql/mysql-5.1.61.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.1 2012/01/31 09:33:11 robbat2 Exp $ + +EAPI="4" + +MY_EXTRAS_VER="20111118-2347Z" +# PBXT +PBXT_VERSION='1.0.11-6-pre-ga' +# XtraDB +PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10' + +# Build type +BUILD="autotools" + +inherit toolchain-funcs mysql-v2 + +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +# This is often broken still +EPATCH_EXCLUDE='' + +# Most of these are in the eclass +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + >=sys-devel/libtool-2.2.10" +RDEPEND="${RDEPEND}" + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt +src_prepare() { + sed -i \ + -e '/^noinst_PROGRAMS/s/basic-t//g' \ + "${S}"/unittest/mytap/t/Makefile.am + mysql-v2_src_prepare +} + +# Official test instructions: +# USE='berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + emake check || die "make check failed" + if ! use "minimal" ; then + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + cd "${S}" + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + local retstatus_unit + local retstatus_ns + local retstatus_ps + local t + addpredict /this-dir-does-not-exist/t9.MYI + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + # archive_gis really sucks a lot, but it's only relevant for the + # USE=extraengines case + case ${PV} in + 5.0.42) + mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42" + ;; + + 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) + [ "$(tc-endian)" == "big" ] && \ + mysql-v2_disable_test \ + "archive_gis" \ + "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" + ;; + esac + + # This was a slight testcase breakage when the read_only security issue + # was fixed. + case ${PV} in + 5.0.54|5.0.51*) + mysql-v2_disable_test \ + "read_only" \ + "Broken in 5.0.51-54, output in wrong order" + ;; + esac + + # Ditto to read_only + [ "${PV}" == "5.0.51a" ] && \ + mysql-v2_disable_test \ + "view" \ + "Broken in 5.0.51, output in wrong order" + + # x86-specific, OOM issue with some subselects on low memory servers + [ "${PV}" == "5.0.54" ] && \ + [ "${ARCH/x86}" != "${ARCH}" ] && \ + mysql-v2_disable_test \ + "subselect" \ + "Testcase needs tuning on x86 for oom condition" + + # Broke with the YaSSL security issue that didn't affect Gentoo. + [ "${PV}" == "5.0.56" ] && \ + for t in openssl_1 rpl_openssl rpl_ssl ssl \ + ssl_8k_key ssl_compress ssl_connect ; do \ + mysql-v2_disable_test \ + "$t" \ + "OpenSSL tests broken on 5.0.56" + done + + # New test was broken in first time + # Upstream bug 41066 + # http://bugs.mysql.com/bug.php?id=41066 + [ "${PV}" == "5.0.72" ] && \ + mysql-v2_disable_test \ + "status2" \ + "Broken in 5.0.72, new test is broken, upstream bug #41066" + + # The entire 5.0 series has pre-generated SSL certificates, they have + # mostly expired now. ${S}/mysql-tests/std-data/*.pem + # The certs really SHOULD be generated for the tests, so that they are + # not expiring like this. We cannot do so ourselves as the tests look + # closely as the cert path data, and we do not have the CA key to regen + # ourselves. Alternatively, upstream should generate them with at least + # 50-year validity. + # + # Known expiry points: + # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 + # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 + # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 + # + # mysql-test/std_data/untrusted-cacert.pem is MEANT to be + # expired/invalid. + case ${PV} in + 5.0.*|5.1.*|5.4.*|5.5.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ + ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ + mysql-v2_disable_test \ + "$t" \ + "These OpenSSL tests break due to expired certificates" + done + ;; + esac + + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade, main.information_schema, + # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # main.not_partition: + # Failure reason unknown at this time, must resolve before package.mask + # removal FIXME + case ${PV} in + 5.1.*|5.4.*|5.5.*) + for t in main.mysql_client_test main.mysql_comments \ + main.mysql_upgrade \ + main.information_schema \ + main.not_partition funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql funcs_1.is_triggers; do + mysql-v2_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + + # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. + # These tests are picking up a 'connect-timeout' config from somewhere, + # which is not valid, and since it does not have 'loose-' in front of + # it, it's causing a failure + case ${PV} in + 5.1.5*|5.4.*|5.5.*|6*) + for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do + mysql-v2_disable_test "$t" \ + "False positives in Gentoo: connect-timeout" + done + ;; + esac + + use profiling && use community \ + || mysql-v2_disable_test main.profiling \ + "Profiling test needs profiling support" + + if [ "${PN}" == "mariadb" ]; then + for t in \ + parts.part_supported_sql_func_ndb \ + parts.partition_auto_increment_ndb ; do + mysql-v2_disable_test $t "ndb not supported in mariadb" + done + fi + + # This fail with XtraDB in place of normal InnoDB + # TODO: test if they are broken with the rest of the Percona patches + if xtradb_patch_available && use xtradb ; then + for t in main.innodb innodb.innodb_bug51378 \ + main.information_schema_db main.mysqlshow \ + main.innodb-autoinc main.innodb_bug21704 \ + main.innodb_bug44369 main.innodb_bug46000 \ + main.index_merge_innodb \ + innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \ + innodb.innodb-autoinc innodb.innodb-autoinc-44030 \ + innodb.innodb_bug21704 innodb.innodb_bug44369 \ + innodb.innodb_bug46000 innodb.innodb_bug48024 \ + innodb.innodb_bug49164 innodb.innodb_bug51920 \ + innodb.innodb_bug54044 \ + ; do + mysql-v2_disable_test $t "tests broken in xtradb" + done + fi + + # bug 332565 + if ! use extraengine ; then + for t in main.range ; do + mysql-v2_disable_test $t "Test $t requires USE=extraengine" + done + fi + + # create directories because mysqladmin might make out of order + mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} + + # We run the test protocols seperately + emake test-unit + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" + retstatus_ns=$? + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" + retstatus_ps=$? + [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + # TODO: + # When upstream enables the pr and nr testsuites, we need those as well. + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" + [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + else + einfo "Skipping server tests due to minimal build." + fi +} diff --git a/dev-db/mysql/mysql-5.5.20.ebuild b/dev-db/mysql/mysql-5.5.20.ebuild new file mode 100644 index 000000000000..a9f2d5d90765 --- /dev/null +++ b/dev-db/mysql/mysql-5.5.20.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.20.ebuild,v 1.1 2012/01/31 09:33:11 robbat2 Exp $ + +EAPI="4" + +MY_EXTRAS_VER="20111118-2347Z" +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" + +# Build type +BUILD="cmake" + +inherit toolchain-funcs mysql-v2 +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# Define the mysql-extras source +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +EPATCH_EXCLUDE='' + +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" +RDEPEND="${RDEPEND}" + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt + +# Official test instructions: +# USE='berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + + local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! use "minimal" ; then + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + # create directories because mysqladmin might right out of order + mkdir -p "${S}"/mysql-test/var-{tests}{,/log} + + # These are failing in MySQL 5.5 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help-notwin + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # sys_vars.plugin_dir_basic + # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin + # instead of MYSQL_LIBDIR/plugin + # + # main.flush_read_lock_kill + # fails because of unknown system variable 'DEBUG_SYNC' + # + # main.openssl_1 + # error message changing + # -mysqltest: Could not open connection 'default': 2026 SSL connection + # error: ASN: bad other signature confirmation + # +mysqltest: Could not open connection 'default': 2026 SSL connection + # error: error:00000001:lib(0):func(0):reason(1) + # + + for t in main.mysql_client_test \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help-notwin main.flush_read_lock_kill \ + sys_vars.plugin_dir_basic main.openssl_1 ; do + mysql-v2_disable_test "$t" "False positives in Gentoo" + done + + # Run mysql tests + pushd "${TESTDIR}" + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + popd + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + + else + + einfo "Skipping server tests due to minimal build." + fi +} diff --git a/dev-lang/scala/scala-2.9.1.ebuild b/dev-lang/scala/scala-2.9.1.ebuild index 6a890ff28bea..929c43311e5c 100644 --- a/dev-lang/scala/scala-2.9.1.ebuild +++ b/dev-lang/scala/scala-2.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.1.ebuild,v 1.2 2012/01/26 07:14:50 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.1.ebuild,v 1.3 2012/01/31 09:22:41 ali_bush Exp $ EAPI="3" JAVA_PKG_IUSE="doc examples source" @@ -26,7 +26,7 @@ IUSE="binary emacs" # one fails with 1.7, two with 1.4 (blackdown) #RESTRICT="test" -DEPEND=">=virtual/jdk-1.6 +DEPEND="virtual/jdk:1.6 java-virtuals/jdk-with-com-sun !binary? ( dev-java/ant-contrib:0 diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest index 6c06b16763f3..c567fb4fc571 100644 --- a/dev-libs/libpqxx/Manifest +++ b/dev-libs/libpqxx/Manifest @@ -1,2 +1,3 @@ DIST libpqxx-2.6.9.tar.gz 1639557 RMD160 c456b5a3ed3c96963aad334d3504ed0443a8f63e SHA1 8be9dcd0375337b170d5c94370fa896911d361f1 SHA256 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a +DIST libpqxx-3.1.tar.gz 1771846 RMD160 09fe492dfc3d16255c39a122e397e2c22bbee483 SHA1 700e0c96a2728eed70c48badb16ba1173cc24d2c SHA256 8950433f193e118cfd36ab91391eb174ef48897bacc26197da596988e66796a0 DIST libpqxx-4.0.tar.gz 2631181 RMD160 517683e7f936126a9d133056740802518f62d18a SHA1 09e6301e610e7acddbec85f4803886fd6822b2e6 SHA256 b160043289cfbf2a186d3b12f9976b6914e76d918d3d4469ff408bd199bbb8ed diff --git a/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch b/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch new file mode 100644 index 000000000000..91cd5d24a5f1 --- /dev/null +++ b/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch @@ -0,0 +1,24 @@ +--- a/include/pqxx/compiler-internal.hxx ++++ b/include/pqxx/compiler-internal.hxx +@@ -76,7 +76,7 @@ + namespace internal + { + /// Wrapper for std::distance; not all platforms have std::distance(). +-template inline ptrdiff_t distance(T first, T last) ++template inline PGSTD::ptrdiff_t distance(T first, T last) + { + #ifdef PQXX_HAVE_DISTANCE + return PGSTD::distance(first, last); +--- a/test/unit/test_escape.cxx ++++ b/test/unit/test_escape.cxx +@@ -54,8 +54,8 @@ + PQXX_CHECK_EQUAL(t.quote("x"), "'x'", "Basic quote() fails."); + PQXX_CHECK_EQUAL(t.quote(1), "'1'", "quote() not dealing with int properly."); + PQXX_CHECK_EQUAL(t.quote(0), "'0'", "Quoting zero is a problem."); +- const char *const nullptr = NULL; +- PQXX_CHECK_EQUAL(t.quote(nullptr), "NULL", "Not quoting NULL correctly."); ++ const char *const null_ptr = NULL; ++ PQXX_CHECK_EQUAL(t.quote(null_ptr), "NULL", "Not quoting NULL correctly."); + PQXX_CHECK_EQUAL(t.quote(string("'")), "''''", "Escaping quotes goes wrong."); + + PQXX_CHECK_EQUAL(t.quote("x"), diff --git a/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild new file mode 100644 index 000000000000..220fb88e450e --- /dev/null +++ b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild,v 1.3 2012/01/31 11:18:22 titanofold Exp $ + +EAPI="4" + +inherit eutils + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +DESCRIPTION="C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL." +SRC_URI="http://pqxx.org/download/software/${PN}/${P}.tar.gz" +HOMEPAGE="http://pqxx.org/development/libpqxx/" +LICENSE="BSD" +SLOT="0" +IUSE="doc" + +DEPEND="dev-db/postgresql-base" +RDEPEND="${DEPEND}" + +# src_test is interactive unless PGDATABASE and PGUSER is set either as an +# environment variable or in /etc/libpqxx_test_env +PROPERTIES="interactive" + +src_prepare() { + epatch "${FILESDIR}/libpqxx-3.1-gcc46.patch" +} + +src_configure() { + econf --enable-shared +} + +src_install () { + emake DESTDIR="${D}" install + + dodoc AUTHORS ChangeLog NEWS README* + use doc && dohtml -r doc/html/* +} + +src_test() { + ewarn "The tests need a running PostgreSQL server version 8.4.x or older" + ewarn "and an existing database." + ewarn "Test requires PGDATABASE and PGUSER to be set at a minimum." + ewarn "Optionally, set PGPORT and PGHOST." + ewarn "Define them at the command line or in:" + ewarn " ${EROOT%/}/etc/libpqxx_test_env" + ewarn "Make sure 'standard_conforming_strings' is set to off in postgresql.conf." + + if [[ -z $PGDATABASE || -z $PGUSER ]] ; then + if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then + source "${EROOT%/}/etc/libpqxx_test_env" + [[ -n $PGDATABASE ]] && export PGDATABASE + [[ -n $PGHOST ]] && export PGHOST + [[ -n $PGPORT ]] && export PGPORT + [[ -n $PGUSER ]] && export PGUSER + fi + + # In case the file wasn't written properly or doesn't exist + if [[ -z $PGDATABASE || -z $PGUSER ]] ; then + echo -n "Database (Default: $(whoami)): " + read PGDATABASE + [[ -n $PGDATABASE ]] && export PGDATABASE + echo -n "Host (Default: Unix socket): " + read PGHOST + [[ -n $PGHOST ]] && export PGHOST + echo -n "Port (Default: 5432): " + read PGPORT + [[ -n $PGPORT ]] && export PGPORT + echo -n "User (Default: $(whoami)): " + read PGUSER + [[ -n $PGUSER ]] && export PGUSER + fi + fi + + local server_version + server_version=$(psql -Aqwtc 'SELECT version();' 2> /dev/null) + if [[ $? = 0 ]] ; then + server_version=$(echo ${server_version} | cut -d " " -f 2 | cut -d "." -f -2 | tr -d .) + if [[ $server_version < 90 ]] ; then + cd "${S}/test" + emake check + else + eerror "Server version must be 8.4.x or below." + die "Server version isn't 8.4.x or below" + fi + else + eerror "Is the server running?" + eerror "Check that the role and database exist, and authentication method is set to" + eerror "trust for:" + eerror " Role: ${PGUSER}" + eerror " Database: ${PGDATABASE}" + die "Couldn't connect to server." + fi +} diff --git a/dev-php/PEAR-PhpDocumentor/Manifest b/dev-php/PEAR-PhpDocumentor/Manifest index 318898bd810b..f47b704811f2 100644 --- a/dev-php/PEAR-PhpDocumentor/Manifest +++ b/dev-php/PEAR-PhpDocumentor/Manifest @@ -1,3 +1,4 @@ DIST PhpDocumentor-1.4.0.tgz 2435775 RMD160 8e0d53fd47fc59f657b76c48554fe5e5dc3e0711 SHA1 71e761fc98d71464eb9534e71c52bfea1809ffc1 SHA256 478111217321a8a769be8faf65cbb41b173d64beb5ca3d7d485a8d31782f9068 DIST PhpDocumentor-1.4.1.tgz 2423563 RMD160 cc77a42c047079a3936bd2c43f37d9d37a4c0a14 SHA1 c9fa5c654de8b2ef2bf4d6c2e3e2049a18ee8ad6 SHA256 2cc2141299b1f31d2482316a7c80b8dab05ac51543fd05b366b271bb0188744d DIST PhpDocumentor-1.4.3.tgz 2423486 RMD160 1f9715575ff4aedd95f262a49750e2aa63ffef32 SHA1 7d3aaf02154a42491386cb09841416405b028d11 SHA256 af27a2cf944aa3c7b22e9fc5317960746676e7683f1ed50c0a3049ab26c3a6de +DIST PhpDocumentor-1.4.4.tgz 1534088 RMD160 2edb22656d99b175da04f92167fe96be83fe91e2 SHA1 40eeca8e6054aae0b145bd7486bf12d774538224 SHA256 bec596cf9ae8b7534cf4c6e1a142ae11c7004aedf2f02fa9eb2050d566e62088 diff --git a/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild b/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild new file mode 100644 index 000000000000..766db0f2a0b9 --- /dev/null +++ b/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild,v 1.1 2012/01/31 10:36:59 olemarkus Exp $ + +EAPI="4" + +inherit php-pear-r1 + +DESCRIPTION="The phpDocumentor package provides automatic documenting of php api directly from the source." +# see http://pear.php.net/bugs/bug.php?id=12577 for additional info on licensing mess +LICENSE="PHP-2.02 PHP-3 LGPL-2.1 public-domain Apache-2.0 BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="minimal" + +RDEPEND="!minimal? ( >=dev-php/PEAR-XML_Beautifier-1.1-r1 ) + >=dev-php/smarty-2.6.0 + =sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3 +ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +0 +http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.61.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.61.tar.gz mirror://gentoo/mysql-extras-20111118-2347Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20111118-2347Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) + +http://www.mysql.com/ +GPL-2 +A fast, multi-threaded, multi-user SQL database server. +~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris +autotools eutils flag-o-matic gnuconfig libtool multilib mysql-autotools mysql-v2 mysql_fx portability toolchain-funcs user versionator +big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling pbxt xtradb + +perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 + +4 + +compile config configure install postinst postrm preinst prepare setup test unpack + + + + + diff --git a/metadata/cache/dev-db/mysql-5.5.20 b/metadata/cache/dev-db/mysql-5.5.20 new file mode 100644 index 000000000000..e3f475641a11 --- /dev/null +++ b/metadata/cache/dev-db/mysql-5.5.20 @@ -0,0 +1,22 @@ +|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 systemtap? ( >=dev-util/systemtap-1.3 ) +ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +0 +http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.20.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.20.tar.gz mirror://gentoo/mysql-extras-20111118-2347Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20111118-2347Z.tar.bz2 + +http://www.mysql.com/ +GPL-2 +A fast, multi-threaded, multi-user SQL database server. +~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd +base cmake-utils eutils flag-o-matic gnuconfig multilib mysql-cmake mysql-v2 mysql_fx portability toolchain-funcs user versionator +debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling systemtap + +perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 + +4 + +compile config configure install postinst postrm preinst prepare setup test unpack + + + + + diff --git a/metadata/cache/dev-lang/scala-2.9.1 b/metadata/cache/dev-lang/scala-2.9.1 index 98badb77544f..f9134292df53 100644 --- a/metadata/cache/dev-lang/scala-2.9.1 +++ b/metadata/cache/dev-lang/scala-2.9.1 @@ -1,4 +1,4 @@ ->=virtual/jdk-1.6 java-virtuals/jdk-with-com-sun !binary? ( dev-java/ant-contrib:0 ) app-arch/xz-utils >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 +virtual/jdk:1.6 java-virtuals/jdk-with-com-sun !binary? ( dev-java/ant-contrib:0 ) app-arch/xz-utils >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 >=virtual/jre-1.6 !dev-java/scala-bin >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) 0 !binary? ( http://www.scala-lang.org/downloads/distrib/files/scala-2.9.1.final-sources.txz -> scala-2.9.1.tar.xz ) binary? ( http://dev.gentoo.org/~ali_bush/distfiles/scala-2.9.1-gentoo-binary.tar.bz2 ) diff --git a/metadata/cache/dev-libs/libpqxx-3.1-r3 b/metadata/cache/dev-libs/libpqxx-3.1-r3 new file mode 100644 index 000000000000..45f81dca9007 --- /dev/null +++ b/metadata/cache/dev-libs/libpqxx-3.1-r3 @@ -0,0 +1,22 @@ +dev-db/postgresql-base +dev-db/postgresql-base +0 +http://pqxx.org/download/software/libpqxx/libpqxx-3.1.tar.gz + +http://pqxx.org/development/libpqxx/ +BSD +C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL. +~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +eutils multilib portability toolchain-funcs user +doc + + + +4 +interactive +configure install prepare test + + + + + diff --git a/metadata/cache/dev-php/PEAR-PhpDocumentor-1.4.4 b/metadata/cache/dev-php/PEAR-PhpDocumentor-1.4.4 new file mode 100644 index 000000000000..bb29ac0112b1 --- /dev/null +++ b/metadata/cache/dev-php/PEAR-PhpDocumentor-1.4.4 @@ -0,0 +1,22 @@ +dev-lang/php >=dev-php/pear-1.8.1 +!minimal? ( >=dev-php/PEAR-XML_Beautifier-1.1-r1 ) >=dev-php/smarty-2.6.0 =dev-php/pear-1.8.1 +0 +http://pear.php.net/get/PhpDocumentor-1.4.4.tgz + +http://pear.php.net/PhpDocumentor +PHP-2.02 PHP-3 LGPL-2.1 public-domain Apache-2.0 BSD +The phpDocumentor package provides automatic documenting of php api directly from the source. +~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 +multilib php-pear-r1 toolchain-funcs +minimal + + + +4 + +install prepare + + + + + diff --git a/metadata/cache/dev-php/propel-1.6.4 b/metadata/cache/dev-php/propel-1.6.4 new file mode 100644 index 000000000000..d9b6e030bf4c --- /dev/null +++ b/metadata/cache/dev-php/propel-1.6.4 @@ -0,0 +1,22 @@ + +~dev-php/propel-generator-1.6.4 ~dev-php/propel-runtime-1.6.4 +0 + + +http://propelorm.org +LGPL-2.1 +Object Persistence Layer for PHP 5. +~amd64 ~x86 + + + + + +4 + +- + + + + + diff --git a/metadata/cache/dev-php/propel-generator-1.6.4 b/metadata/cache/dev-php/propel-generator-1.6.4 new file mode 100644 index 000000000000..617dc717fc50 --- /dev/null +++ b/metadata/cache/dev-php/propel-generator-1.6.4 @@ -0,0 +1,22 @@ +>=dev-lang/php-5.3[pdo,xml,xsl] >=dev-php/pear-1.9.0-r1 dev-lang/php dev-lang/php >=dev-php/pear-1.9.0 +>=dev-lang/php-5.3[pdo,xml,xsl] >=dev-php/pear-1.9.0-r1 >=dev-php/phing-2.3.0 dev-lang/php dev-lang/php >=dev-php/pear-1.9.0 +0 +http://pear.propelorm.org/get/propel_generator-1.6.4.tgz + +http://propelorm.org +LGPL-2.1 +Object Persistence Layer for PHP 5 (Generator). +~amd64 ~x86 +depend.php eutils multilib php-pear-lib-r1 phpconfutils portability toolchain-funcs user + + + + +4 + +install setup + + + + + diff --git a/metadata/cache/dev-php/propel-runtime-1.6.4 b/metadata/cache/dev-php/propel-runtime-1.6.4 new file mode 100644 index 000000000000..ad24251d7ff1 --- /dev/null +++ b/metadata/cache/dev-php/propel-runtime-1.6.4 @@ -0,0 +1,22 @@ +>=dev-lang/php-5.3[pdo,xml,xsl] >=dev-php/pear-1.9.0-r1 dev-lang/php dev-lang/php >=dev-php/pear-1.9.0 +>=dev-lang/php-5.3[pdo,xml,xsl] >=dev-php/pear-1.9.0-r1 >=dev-php/PEAR-Log-1.8.7-r1 dev-lang/php dev-lang/php >=dev-php/pear-1.9.0 +0 +http://pear.propelorm.org/get/propel_runtime-1.6.4.tgz + +http://propelorm.org +LGPL-2.1 +Object Persistence Layer for PHP 5 (Runtime). +~amd64 ~x86 +depend.php eutils multilib php-pear-lib-r1 phpconfutils portability toolchain-funcs user + + + + +4 + +install setup + + + + + diff --git a/metadata/cache/games-puzzle/drod-bin-1.6.6 b/metadata/cache/games-puzzle/drod-bin-1.6.6 index f14795b1470b..3f45861113bd 100644 --- a/metadata/cache/games-puzzle/drod-bin-1.6.6 +++ b/metadata/cache/games-puzzle/drod-bin-1.6.6 @@ -1,5 +1,5 @@ -x11-libs/libX11 amd64? ( app-emulation/emul-linux-x86-xlibs ) +x86? ( x11-libs/libX11 media-libs/freetype media-libs/libsdl media-libs/sdl-ttf sys-libs/libstdc++-v3 ) amd64? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-compat ) 0 mirror://sourceforge/drod/CDROD-1.6.6-setup.sh.bin strip diff --git a/metadata/cache/kde-base/phonon-kde-4.6.3 b/metadata/cache/kde-base/phonon-kde-4.6.3 index 861c4238fdb0..8a1748dbedb4 100644 --- a/metadata/cache/kde-base/phonon-kde-4.6.3 +++ b/metadata/cache/kde-base/phonon-kde-4.6.3 @@ -1,5 +1,5 @@ ->=media-libs/phonon-4.4.3[xine?] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.3:4[aqua=] >=media-libs/qimageblitz-0.0.4 ->=media-libs/phonon-4.4.3[xine?] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.6.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.3:4[aqua=] >=media-libs/qimageblitz-0.0.4 +>=media-libs/phonon-4.4.3 alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.3:4[aqua=] >=media-libs/qimageblitz-0.0.4 +>=media-libs/phonon-4.4.3 alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.6.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.3:4[aqua=] >=media-libs/qimageblitz-0.0.4 4 mirror://kde/stable/4.6.3/src/kdebase-runtime-4.6.3.tar.bz2 @@ -8,7 +8,7 @@ GPL-2 Phonon KDE Integration amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx -alsa debug xine pulseaudio kdeprefix aqua +alsa debug pulseaudio kdeprefix aqua diff --git a/metadata/cache/kde-base/phonon-kde-4.7.4 b/metadata/cache/kde-base/phonon-kde-4.7.4 index 725c8f21ad63..2d8aef28e732 100644 --- a/metadata/cache/kde-base/phonon-kde-4.7.4 +++ b/metadata/cache/kde-base/phonon-kde-4.7.4 @@ -1,5 +1,5 @@ ->=media-libs/phonon-4.4.3[xine?] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4 ->=media-libs/phonon-4.4.3[xine?] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4 +>=media-libs/phonon-4.4.3 alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4 +>=media-libs/phonon-4.4.3 alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) >=kde-base/oxygen-icons-4.7.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.4:4[aqua=] >=media-libs/qimageblitz-0.0.4 4 mirror://kde/stable/4.7.4/src/kde-runtime-4.7.4.tar.bz2 @@ -8,7 +8,7 @@ GPL-2 Phonon KDE Integration amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions kde4-meta multilib portability toolchain-funcs user versionator virtualx -alsa debug xine pulseaudio aqua +alsa debug pulseaudio aqua diff --git a/metadata/cache/media-gfx/gtkam-0.1.18 b/metadata/cache/media-gfx/gtkam-0.1.18 new file mode 100644 index 000000000000..489f5504ec58 --- /dev/null +++ b/metadata/cache/media-gfx/gtkam-0.1.18 @@ -0,0 +1,22 @@ +x11-libs/gtk+:2 >media-libs/libgphoto2-2.4 >=media-libs/libexif-0.3.2 media-libs/libexif-gtk gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 ) >=dev-util/intltool-0.40 dev-util/pkgconfig app-text/scrollkeeper nls? ( >=sys-devel/gettext-0.14.1 ) app-arch/xz-utils >=sys-apps/sed-4 +x11-libs/gtk+:2 >media-libs/libgphoto2-2.4 >=media-libs/libexif-0.3.2 media-libs/libexif-gtk gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 ) +0 +mirror://sourceforge/gphoto/gtkam-0.1.18.tar.bz2 + +http://gphoto.org/proj/gtkam +GPL-2 +A frontend for gPhoto 2 +~alpha ~amd64 ~ppc ~sparc ~x86 +eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator +gimp gnome nls debug + + + +4 + +compile configure install postinst postrm preinst prepare setup unpack + + + + + diff --git a/metadata/cache/media-tv/linuxtv-dvb-headers-5.3 b/metadata/cache/media-tv/linuxtv-dvb-headers-5.3 index 5ed0eaec9a20..4b088a2545c2 100644 --- a/metadata/cache/media-tv/linuxtv-dvb-headers-5.3 +++ b/metadata/cache/media-tv/linuxtv-dvb-headers-5.3 @@ -6,7 +6,7 @@ http://www.linuxtv.org GPL-2 Virtual Package installing the Header files for DVB -~amd64 ~arm ~ppc ~ppc64 ~x86 +amd64 ~arm ~ppc ~ppc64 x86 diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 7d2129420755..3f280b6850d4 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Tue, 31 Jan 2012 09:06:50 +0000 +Tue, 31 Jan 2012 13:06:53 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 85f226c5268b..3f280b6850d4 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Tue, 31 Jan 2012 09:06:51 +0000 +Tue, 31 Jan 2012 13:06:53 +0000 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 0daed1bf8905..a7214cb68295 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Tue, 31 Jan 2012 09:06:52 +0000 +Tue, 31 Jan 2012 13:06:55 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 43396b9f5ac8..8db05456a2af 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Tue Jan 31 09:06:50 UTC 2012 +Tue Jan 31 13:06:53 UTC 2012 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index c264cdbbd920..3d677cf7fe18 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Tue, 31 Jan 2012 09:30:01 +0000 +Tue, 31 Jan 2012 13:15:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 60e8ca4487d3..3d2cc84a6b72 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1328000701 Tue Jan 31 09:05:01 2012 UTC +1328015101 Tue Jan 31 13:05:01 2012 UTC diff --git a/profiles/use.desc b/profiles/use.desc index e7de1900086b..3e97cb6fd9ec 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.475 2012/01/27 16:46:01 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.476 2012/01/31 09:40:31 mr_bones_ Exp $ # Keep them sorted @@ -114,7 +114,6 @@ geoip - Add geoip support for country and city lookup based on IPs ggi - Adds support for media-libs/libggi (non-X video api/drivers) gif - Adds GIF image support gimp - Build a plugin for the GIMP -ginac - Adds sci-mathematics/ginac (symbolic math) support glut - Build an OpenGL plugin using the GLUT library gmp - Adds support for dev-libs/gmp (GNU MP library) gnome - Adds GNOME support diff --git a/www-client/chromium/chromium-17.0.963.46.ebuild b/www-client/chromium/chromium-17.0.963.46.ebuild index 477288309e37..4c52f05d264d 100644 --- a/www-client/chromium/chromium-17.0.963.46.ebuild +++ b/www-client/chromium/chromium-17.0.963.46.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.46.ebuild,v 1.1 2012/01/31 00:25:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.46.ebuild,v 1.2 2012/01/31 10:11:46 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -188,6 +188,9 @@ src_prepare() { # Revert WebKit changeset responsible for Gentoo bug #393471. epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r0.patch" + # Backport upstream fix for Gentoo bug #389479. + epatch "${FILESDIR}/${PN}-dev-shm-r0.patch" + epatch_user # Remove most bundled libraries. Some are still needed. @@ -380,8 +383,9 @@ src_test() { # NetUtilTest: bug #361885. # NetUtilTest.GenerateFileName: some locale-related mismatch. # UDP: unstable, active development. We should revisit this later. + # CertDatabaseNSSTest.ImportCACertHierarchyTree: works in 18.x, broken here. LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ - '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*' + '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*:CertDatabaseNSSTest.ImportCACertHierarchyTree' LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake }