From: Alexandre Rostovtsev Date: Sat, 7 Mar 2015 03:18:56 +0000 (+0000) Subject: bindist is now a RESTRICT flag, not a USE flag (bug #541456, thanks to Ulrich Müller). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82e46f22ad76a572bb3a9be2fadd48300d8654d0;p=gentoo.git bindist is now a RESTRICT flag, not a USE flag (bug #541456, thanks to Ulrich Müller). Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D --- diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index f12a17480559..dbd2f1c8c0a1 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/libgda -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.228 2014/12/28 15:50:28 titanofold Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.229 2015/03/07 03:18:51 tetromino Exp $ + + 07 Mar 2015; Alexandre Rostovtsev libgda-5.2.2.ebuild, + metadata.xml: + bindist is now a RESTRICT flag, not a USE flag (bug #541456, thanks to Ulrich + Müller). 28 Dec 2014; Aaron W. Swenson libgda-5.2.2.ebuild: Rename virtual/postgresql to dev-db/postgresql diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index 9b3efad5b493..1c874aebe5da 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -4,13 +4,25 @@ Hash: SHA256 AUX libgda-4.99.1-control-center-icon-collision.patch 2266 SHA256 dc52049ea4706fc8a8a91bc7c572abc275a312f7e0df15cf1b82c73ef8e4f63e SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 WHIRLPOOL f766d52e6c9591b4a7040105f0765df63412da92e7aa60aa4921cedf2f05ba60a732d72f443358ab78735c9dd44e51ce8e12ca5c3892b9e077f04b0772412650 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 SHA256 d89d44e62a1a483cd77f13c723f0541f39a71a5f0651197d3e25d1093567d78c SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 WHIRLPOOL c4f2b570f5fb486a4f1a6d3575e0849a13c78fcc1d05d2b64d4cb15f0af83a54bb8d184ec14ce501ee7e7dcc10f4b3a6c32c1d458e312c13716bde7752ff71c6 DIST libgda-5.2.2.tar.xz 12173216 SHA256 c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4 SHA512 b09ef364c3357a58b17508a39ee53ef462baa54bb3c8af580d23fd2771b034355092ecdb7ef29b29dd08533394a702f12b838732c712fb6b3a04b6b201cd3c74 WHIRLPOOL 463efc5825be741d55ab6741d250f537537d59c71d926c20c7202f384e5c7c9b2bcc49419a796df4bfa5e9248f59bcf12aa8331495c3aae7d56408f295c0693f -EBUILD libgda-5.2.2.ebuild 4358 SHA256 08ce10016af72fc81ec585fdb9241a2a1efb06f10d6042f12ece49535bc2847b SHA512 6b59550a772c6804de626f913b89b009d07ede1e98660ac4cee2dd1439cc7f226ffd9457d31e01c614d0ae5d563842c4c68ac80989ff59227f2ab50ea054e56c WHIRLPOOL f46ca921f1023e3eb8055538a3cc45c08737109dc316cc47d488fe6f96c52b3868914e45918a19c16b43949c94ccedba3883bf5d5c48a0fffa2d7656ed0fb5de -MISC ChangeLog 35138 SHA256 0d61bab9a507cf6cbdde8efa13dcc6edc059954578cc813281b7064ae75e9e2e SHA512 aa1d00eb4375dedb43285c706a08ff29aae0cdb4975848493832a45942277a205ca3bc26979be25a56835b8e0304e1a5bd0dcd0f94a555043f5eccf8e1ac559f WHIRLPOOL 1351ae09128c20ef16e5f759dd4f6db0382e154630b3c62c754bf7ed1c6a3d876eb2d8fd8a280817564c09fd72fc9a4ff42dea29e167c7cab91ae40136f241a4 -MISC metadata.xml 908 SHA256 950b0cbb48f8f9254e4457efc8d4e290edcc814a1b07dfb85eb0d61b077bfc4c SHA512 e9b04c54efd1d15fed1e3820e0b5ccb9c6bd8260deabc9e850278132906263e18f4156598b3bafc26ef57ae0e83a95a6560e182bf7b3c63db045611ee36549b7 WHIRLPOOL d8f28595e61688646263d534b60235072294c96a62f1c86bd42a83ce481dc584c4939ad354b55718169c64522656d135ab4f0733db2a9fa05e27a6490aff3e5c +EBUILD libgda-5.2.2.ebuild 4405 SHA256 c7051a3bf7cc1925ca91efdf8dd8c8b6f59ab6a6453f537becbe41cee832c581 SHA512 10c411b7a0222e5e5a883ec827315281f773a7d1bc911c80194769a1552990a4947444aecfc8a5533fbe4be87cbf64d0c6931f8e1e3a9ddc15a494575958b0bf WHIRLPOOL 7665eb2fd54316aa32ce2c99aa7e9d3396bb4145e566cc992c9e68e9e02b986330e5b2fb0b6d6124381e553ac8adc2b2e76984061ae82f475fb807a184ebe916 +MISC ChangeLog 35326 SHA256 995be42cc6088db7765fe56eaf9e3457bf8959d32995f1371b5cac694ecf79d6 SHA512 4d226375a92dd7d22abdff12fd3f5cec2208d17c3cf24759e7a43528bd82d9064df25bb0c57a77000610139c0f0616d7258c92710d96ee12dedb4a2000e24c3a WHIRLPOOL 116546803355e8856369d6cd24ff5cb255815bc7cefaf2fbfd5b2dc8457675bed5cfd3c887b8cd14fddc24012da1c63a96a8fd827842d0b00c855a60def91262 +MISC metadata.xml 789 SHA256 770f18dd27266375e46ff02e6ee17b0303db4760ef53c459f09d2d77d06b0129 SHA512 4592ec75b9815bb7ce7901578acd1157722f09ff588d564bfa2b974c34849c54fabfb063661264b9690640cef1f822e276460412318c08cee236267450036074 WHIRLPOOL c4f3cef6b1f8d64d8d998e15cbefc9cbed1f93a816bb115605badad9974fd9e7338dad7cd3ba25522f1e9b40fd9986ab5958636533044cfe9f785e2a2ed0505f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iF4EAREIAAYFAlSgJsUACgkQVxOqA9G7/aA9mwD5AZ/aa8NnS8FCZP2Q+jlVIHcU -45Qxql1b2+437PPfIvkBAJGB98aSJuBRUGlkhhiRkX7hGLP+NiwD0N81K9YeWByG -=0Xbn +iQJ8BAEBCABmBQJU+m4cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNz4IP/3BkCQ1ADHHEtbLaj9+Bt3zY +oEv295ZvD9c+gxvMvgKjUCPt4kW5ZOlvB65NA2lmC26yJjLwqUzsM+Z9hQeeBLxx +TD1fEL0GO/hZ6h9tw3jwFWfAsCqu2JHifjrfV+Li89AEgvIbAsRnryLu1LhEEa9E +iA6JwMeoRYWi1Y5UoJz1x514W4u0Dqk6ushE/0+qIHAXwbciMTPQQsrWqy1Usfu4 +9CchOneluSOyxrMaM6/+Nem5Sv9jpd4dKZsvZc92TW+/T7j9TDTBE8+YzvU7BCtN +Vpt+nSpz00N0rqd0QeT3F5ZQXkmNAlqLX9tsbz2IJDwxMVQEBzxHlXW3XEuZryWD +ZX21AuMnaymCgG7VwQSJYQMJ3nopaqIc0fhgS++G4WouNnOBsPGPI1gKXBsg1ISk +dP2xbvcDAMpk9GXUgu1zmWqvkiNpwHG1MzsxGDvrMdLdLWaV9kfS5FD5qHzHTOIh +wpSiG3fH2noykmmbC0Rv4G6LrovV63Gpu8JTLc+hKNqKJQBFyTKNtlLxBk64jDo0 +jMLC5Roh1qkIKZwLO+4Nl/6fH1JiNdoVqSF+xG9jZ65jRaUJSQvagifGgNwvN/tl +M4jKRI6XA/X614zsmsbnMB7zn3QmZYq9YkGryBQGht2a6diUqZK+0SE7IBQHRL7t +IUheWdod+Gd1DjLk4Tfd +=inWB -----END PGP SIGNATURE----- diff --git a/gnome-extra/libgda/libgda-5.2.2.ebuild b/gnome-extra/libgda/libgda-5.2.2.ebuild index fa6f3e6b1c5f..2484742caf76 100644 --- a/gnome-extra/libgda/libgda-5.2.2.ebuild +++ b/gnome-extra/libgda/libgda-5.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.2.2.ebuild,v 1.5 2014/12/28 15:50:28 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.2.2.ebuild,v 1.6 2015/03/07 03:18:51 tetromino Exp $ EAPI="5" GNOME2_LA_PUNT="yes" @@ -16,11 +16,10 @@ DESCRIPTION="GNOME database access library" HOMEPAGE="http://www.gnome-db.org/" LICENSE="GPL-2+ LGPL-2+" -IUSE="berkdb bindist canvas firebird gtk graphviz http +introspection json ldap libsecret mdb mysql oci8 postgres reports sourceview ssl" # vala +IUSE="berkdb canvas firebird gtk graphviz http +introspection json ldap libsecret mdb mysql oci8 postgres reports sourceview ssl" # vala REQUIRED_USE=" reports? ( ${PYTHON_REQUIRED_USE} ) canvas? ( gtk ) - firebird? ( !bindist ) graphviz? ( gtk ) sourceview? ( gtk ) " @@ -37,7 +36,7 @@ RDEPEND=" sys-libs/readline:= sys-libs/ncurses:= berkdb? ( sys-libs/db ) - !bindist? ( firebird? ( dev-db/firebird ) ) + firebird? ( dev-db/firebird ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) @@ -69,7 +68,9 @@ DEPEND="${RDEPEND} # vala? ( $(vala_depend) ) # FIXME: lots of tests failing. Check if they still fail in 5.1.2 -RESTRICT="test" +# firebird support bindist-restricted because it is not GPL compatible +RESTRICT="test + firebird? ( bindist )" pkg_setup() { java-pkg-opt-2_pkg_setup diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml index c0e384d11509..2467a1c19ebe 100644 --- a/gnome-extra/libgda/metadata.xml +++ b/gnome-extra/libgda/metadata.xml @@ -3,8 +3,6 @@ gnome - Disable support for dev-db/firebird database - which is not GPL compatible. Enable support for x11-libs/goocanvas Enable embedded net-libs/libsoup based server Enable app-crypt/libsecret support to