From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QhDMT-00053z-Vz for garchives@archives.gentoo.org; Thu, 14 Jul 2011 04:17:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 045AE21C0D4; Thu, 14 Jul 2011 04:17:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B408321C0D4 for ; Thu, 14 Jul 2011 04:17:08 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D9302AC268 for ; Thu, 14 Jul 2011 04:17:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 51B398003D for ; Thu, 14 Jul 2011 04:17:07 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/ChangeLog dev-db/mariadb/Manifest dev-db/mariadb/mariadb-5.1.55.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: e6d02ed29c1e57f619d25917d8421be049768abb Date: Thu, 14 Jul 2011 04:17:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 623328ff1ec665734cba02ed15b42405 commit: e6d02ed29c1e57f619d25917d8421be049768abb Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Thu Jul 14 04:15:15 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Thu Jul 14 04:15:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3De6d02ed2 [dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild. Drop irrelevant code and use mysql-v2 and not mysql-autotools. (Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit = with key BB0E6E98) --- dev-db/mariadb/ChangeLog | 5 ++ dev-db/mariadb/Manifest | 32 +++++++------- dev-db/mariadb/mariadb-5.1.55.ebuild | 73 ++++------------------------= ----- 3 files changed, 30 insertions(+), 80 deletions(-) diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog index f8773b8..520f62d 100644 --- a/dev-db/mariadb/ChangeLog +++ b/dev-db/mariadb/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 14 Jul 2011; Jorge Manuel B. S. Vicetto + mariadb-5.1.55.ebuild: + [dev-db/mariadb-5.1.55] Sync the ebuild from the mariadb-5.2.7 ebuild. + Drop irrelevant code and use mysql-v2 and not mysql-autotools. + *mariadb-5.2.6 (13 May 2011) =20 13 May 2011; Jorge Manuel B. S. Vicetto diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index f84c13d..136cedd 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 =20 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1= babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468= fd22c5765f8a2adce0344859fc212b7209a3a6c7 AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1= 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4= faed7a749d113db285fd2b96d1d337d2b3a77ea4 @@ -17,27 +17,27 @@ EBUILD mariadb-5.1.42-r1.ebuild 6923 RMD160 1b333ae1f= 3479ddd5f20dca1c7e3f09f026f EBUILD mariadb-5.1.50-r1.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fe= a2581e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553= ae8871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f EBUILD mariadb-5.1.50.ebuild 7463 RMD160 425aa469fcf1fd64dce731932083f8f= 600dbfd44 SHA1 f8614940cd516febbfbc15695558ddf22d7ba95d SHA256 93202988ba= 7d514b424664ede5dba9dab318e79197be5481a4fb199547f74bc5 EBUILD mariadb-5.1.53.ebuild 7453 RMD160 eba70431a2d88bfbdedd80a4c5fea25= 81e942cf9 SHA1 658fd4ac333cce08aff47d59af6a9e707e50e544 SHA256 4a17553ae8= 871ac13c648bbaddb2b3987d9d47ecf49327e1a800e570299c821f -EBUILD mariadb-5.1.55.ebuild 7643 RMD160 ec1c29f91b72556a6605d86eb44b9c7= 1128b9c7d SHA1 b2a68e6b355a17eff1096ae55a10e0fb45a211ac SHA256 b4f3a01897= dc989b5386f1f42759c13748ecd42956382455d545358e06d5aed3 +EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2= eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d= 0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550 EBUILD mariadb-5.2.4.ebuild 7474 RMD160 bcba6db8e171446da195260eee350858= 9dc628e8 SHA1 5d3d46bfdfa7de23d127edece173a5d0d050c159 SHA256 90f1bb336f0= 66aa9bd6a61edde2e16b78ffe4c2cec97fbaa8feda60ff9d3ba35 EBUILD mariadb-5.2.5.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe16= 13add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d13= 58ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c EBUILD mariadb-5.2.6.ebuild 7515 RMD160 38cb1a044b1ff070f099e2b978d5fe16= 13add604 SHA1 048dcb1fec506c1ddb77a3dc021b342eb51378f7 SHA256 e0f0dbe8d13= 58ffd197793ea3ce803547d5fdfcc8b2c7b65a18414521466953c EBUILD mariadb-5.2.7.ebuild 5901 RMD160 056b6bdb6064e5dae224b5671568196f= 65f5e34a SHA1 64abe85e4b59255ab728eedd3ea7a4f3e728dd3f SHA256 e52526c53b6= 4bfec59dc53dfa7080806fad641e1086ae602232e81b981c413e3 -MISC ChangeLog 2594 RMD160 e953d1e10cfac42f2520e771c319421ad9d8b45f SHA1= 163dd69a438e51bf3fb9d2f7dc09066b0a995757 SHA256 101340b4c8378b175307929d= e8d454794b7cc3f601550a6aa1e5fe7c477649d9 +MISC ChangeLog 2825 RMD160 35effd70f7d7997b97d8a0ad53d8e40665c0a207 SHA1= 7ff80b3b933ac18d00642fa045755a76bb27304a SHA256 528b83f353cead56fe884998= 2a006a5f6c499553232e5ea4d64363db5da31021 MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 S= HA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb9= 4b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCAAGBQJOAAflAAoJEC8ZTXQF1qEPkKUP/0aCLoPfqKbNCh4HUyoT4Fq9 -2aYLGxtZdwcvgMizNpjHQZ3npE1q8Txc21YliO9ykgqQNWbK/id5D9sNMrFBi31w -jxeoJbosB76XZCb7rHAQ1vaTixP4Ado0OQflaBOPLWFnX2/DuGkccqCpaAzTd+eu -iKwvojPa9642RHZLlcT14ZuNlv8DEOb0EEWRXiob4POjv3D6VLXQ+101ppNafJmz -/Gs04XfcukmFwT0QgrMhFj9ifkB/29aixMZoEHBgfaWYQgDZiYZjdtZRHOMv9GF2 -z8DR/+By9WSrKYUdK0rzMisqW+cvPrQBbinfuL5hf3Hb+2RLtXyONxSFjMXR7Oi8 -go3Oy3R4SxMLxTWusIuLOx3nghzFL9bZKmetLeqLZLdRVouDDsOaeDhbNGMlTM/o -3chz+S1XX6leFA9JqSI2+kRrtCOkcb2GNgrsYqqOa+1lt2i5zYCTSWROyUVLDXvz -dWfYIdEVqquI63D80C4WBHzLAYgxNyXQOgIch0tv74MmRu7hHGfBi/2Gf0L6HGzQ -0K8qwQ9OzrQhf4HHfpoROAkGRackaLYXD1BvZ0MgPMlbDAM3HOUzalK6zAIxw3j1 -lvxzKxskswahcHdx5SkmlINJ3oRk1N/4VWYTfe2QxbSScqIJFdOEUAjoNJ7I+ehg -Z87OPqAOO4eIm4Cjfgdc -=3D52Jz +iQIcBAEBCgAGBQJOHm1TAAoJEC8ZTXQF1qEPZ5AQAKsaEPUjGjunZR8inQz6tmu6 +0f+Xe2gAFn2FHx7fvgycFCs6Ud0iP+G61V2k53vmMwjha14cR+b98A0MOek4nsQa +DZq3h5mo4q7ZJz28Jn9ggqbswK79UVyuxs4VuiMvCnKYSP6BIQ5LmhFdFfkhim24 +Gp1Ge3c5hbBwT5BxTulAZtd7Gsj0X9IbH1XQv+5fv1cLoAluPZVfRo/X/itfg5Qp +/U3JJhnqAwnHIgCtObSnQjDZ50+OiQ2z5YlEy2qNZq6nNiEUJcBbfRkwll+wooPT +J1qquHk9HoJj0vB8rKfTpH6CbpUyaAwmW22L1GAdfx/mNLxiU+A7DDHOXB676DHw +EnL/nwhAeGX4jzotrmr1bq3/Bg7H78P+eQ+hqEE06xOXcKf2UncEAIdiIHY31Cxl +j+Mkxb9ag+rv7uVauSzw0CAN25uq6NYjTKuoUA8lFZjdTumBasp1jPBbyMlaiOcP +cd7B50ykJ3ATHdLoxLKf17JVv9sYmaaazBJEfZmy/4Wuc0jd967QTtDZgOCESIm8 +1s+Xpe4bvdmBFO0Q61Zh1u9dZe9SYQE3FsGX2fDwUdx6oDgHgbAA01OtjsWIz7Mu +dN4v7V6dQ/8qIEgWHo+O/eWXkXeyAThx+5zSKsWzcowUA+POZWi4ofu6fYxzB6ie +HJEx8sdJ81A+UjMaRTz/ +=3DVyRN -----END PGP SIGNATURE----- diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariad= b-5.1.55.ebuild index 3f17a1b..cc30840 100644 --- a/dev-db/mariadb/mariadb-5.1.55.ebuild +++ b/dev-db/mariadb/mariadb-5.1.55.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v= 1.7 2009/11/09 18:00:20 fauli Exp $ =20 -MY_EXTRAS_VER=3D"live" +MY_EXTRAS_VER=3D"20110426-1046Z" EAPI=3D"2" =20 # Build system @@ -28,7 +28,7 @@ src_prepare() { sed -i \ -e '/^noinst_PROGRAMS/s/basic-t//g' \ "${S}"/unittest/mytap/t/Makefile.am - mysql-autotools_src_prepare + mysql-v2_src_prepare } =20 # Official test instructions: @@ -58,61 +58,6 @@ src_test() { # Ensure that parallel runs don't die export MTR_BUILD_THREAD=3D"$((${RANDOM} % 100))" =20 - # archive_gis really sucks a lot, but it's only relevant for the - # USE=3Dextraengines case - case ${PV} in - 5.0.42) - mysql-autotools_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)" =3D=3D "big" ] && \ - mysql-autotools_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 issu= e - # was fixed. - case ${PV} in - 5.0.54|5.0.51*) - mysql-autotools_disable_test \ - "read_only" \ - "Broken in 5.0.51-54, output in wrong order" - ;; - esac - - # Ditto to read_only - [ "${PV}" =3D=3D "5.0.51a" ] && \ - mysql-autotools_disable_test \ - "view" \ - "Broken in 5.0.51, output in wrong order" - - # x86-specific, OOM issue with some subselects on low memory servers - [ "${PV}" =3D=3D "5.0.54" ] && \ - [ "${ARCH/x86}" !=3D "${ARCH}" ] && \ - mysql-autotools_disable_test \ - "subselect" \ - "Testcase needs tuning on x86 for oom condition" - - # Broke with the YaSSL security issue that didn't affect Gentoo. - [ "${PV}" =3D=3D "5.0.56" ] && \ - for t in openssl_1 rpl_openssl rpl_ssl ssl \ - ssl_8k_key ssl_compress ssl_connect ; do \ - mysql-autotools_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=3D41066 - [ "${PV}" =3D=3D "5.0.72" ] && \ - mysql-autotools_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 @@ -129,10 +74,10 @@ src_test() { # mysql-test/std_data/untrusted-cacert.pem is MEANT to be # expired/invalid. case ${PV} in - 5.0.*|5.1.*|5.4.*|5.5.*) + 5.1.*|5.4.*|5.5.*) for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_k= ey \ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ - mysql-autotools_disable_test \ + mysql-v2_disable_test \ "$t" \ "These OpenSSL tests break due to expired certificates" done @@ -153,13 +98,13 @@ src_test() { # Failure reason unknown at this time, must resolve before package.mas= k # removal FIXME case ${PV} in - 5.1.*|5.4.*|5.5.*) + 5.1.*|5.2.*|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-autotools_disable_test "$t" "False positives in Gentoo" + mysql-v2_disable_test "$t" "False positives in Gentoo" done ;; esac @@ -171,21 +116,21 @@ src_test() { case ${PV} in 5.1.5*|5.4.*|5.5.*|6*) for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do - mysql-autotools_disable_test "$t" \ + mysql-v2_disable_test "$t" \ "False positives in Gentoo: connect-timeout" done ;; esac =20 use profiling && use community \ - || mysql-autotools_disable_test main.profiling \ + || mysql-v2_disable_test main.profiling \ "Profiling test needs profiling support" =20 if [ "${PN}" =3D=3D "mariadb" ]; then for t in \ parts.part_supported_sql_func_ndb \ parts.partition_auto_increment_ndb ; do - mysql-autotools_disable_test $t "ndb not supported in mariadb" + mysql-v2_disable_test $t "ndb not supported in mariadb" done fi =20