From 434d713861b70f6c6563d6ee50a8e64f14c970d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Feb 2018 16:58:00 +0000 Subject: gentoo resync : 15.02.2018 --- dev-ada/gnatcoll/Manifest | 6 +++--- dev-ada/gnatcoll/gnatcoll-2016.ebuild | 11 +++++------ dev-ada/gnatcoll/gnatcoll-2017.ebuild | 11 +++++------ dev-ada/gnatcoll/metadata.xml | 1 - 4 files changed, 13 insertions(+), 16 deletions(-) (limited to 'dev-ada/gnatcoll') diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest index c697b939613d..abbcf70c0ed1 100644 --- a/dev-ada/gnatcoll/Manifest +++ b/dev-ada/gnatcoll/Manifest @@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 -EBUILD gnatcoll-2016.ebuild 2997 BLAKE2B c5ede25bb739b20af41220f035d6d0eb577ef2e9bb5f113d177cf5d014ca73b94df7ab772371361183d4c4af832f2f19475a83965fe09d4749d2b93442e3ffd0 SHA512 ac033da158a745dfb037d1fc632adc082ae717f01efb3b28d3256ccaaf8a2aa6c1f1bcf291185b829925d653723cf2fb765360e0d8bdf1f247ce7cd2d9ae7b0e -EBUILD gnatcoll-2017.ebuild 3125 BLAKE2B 1cec59b829326461c4b4baa93fb83eaff8d4d1ce999bad2d405f3fa94c1f7064983c7032214d279eb7c6b75611c6559b3a553d7f110cbc2ab45602310132bec2 SHA512 e5d0ffb4b41947e9f362124dced0cb873a19e4a7779b910f6331ae77343b9f04890fa532fd1668bfebd6a3f59ffeef8e4c106c1ad0b62b7b7d33b43ddcf0d1c0 -MISC metadata.xml 1412 BLAKE2B 363f55392d7b2859157ecde38b7d2ff918cbd52d4b24a327d80460ee0b1fbcb3f220e32df31b1dd7ce59258c267a2ca843be30b6eba3ffb6f4ccdc1d8360bc3c SHA512 607a522c91bf0e1d7f7bbbdb541d35108e4d77760f9dbb375abca7a361602d9157ed60d1b71fd51af652b718a763010be8daab44eb3a87aa7d47ca0f20e468fc +EBUILD gnatcoll-2016.ebuild 2988 BLAKE2B e114c29a5a7e1ff023c52eb0d1897bee392ce0aab093e22f7b257500c9a6e04658aadfff52e4d125c66fdeed501d06804507b45c292adb501fc4142274472c04 SHA512 fd5f510872ca8c592d88df1981c6c2b383223c70cb5e6b80889631982c1e43a82eb05685d9446172ea365c7d7d2bb25f50fa707ed24d5c8f22fb230ebba16b2a +EBUILD gnatcoll-2017.ebuild 3116 BLAKE2B bc148d0ba9b67c38599cac863ad30f68b947c131404174f6014df5d2141568fcdb60a610a9f4620bae4c6d94565cdb1480a59819b108b18237d520d6cc53f751 SHA512 515842789e8aeff6ca6d7d7c374156b724439b8fbdde898639a2e4b9e3cc6e13a43bc05942cf4fb5cc609da4376dba0dd093c16f180b86895c7bb8999acb9bee +MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940 diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild index dd595440c8b5..0ccb4224f75c 100644 --- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild @@ -16,14 +16,14 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline - +shared sqlite static syslog tools" + +shared sqlite static-libs syslog tools" RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ${PYTHON_DEPS} gmp? ( dev-libs/gmp:* ) gtk? ( - dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?] + dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -35,8 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] - static? ( dev-ada/libgpr[static-libs] ) + =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] )" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=]" @@ -98,7 +97,7 @@ src_compile() { emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/relocatable fi - if use static; then + if use static-libs; then emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/static fi @@ -109,7 +108,7 @@ src_install() { if use shared; then emake prefix="${D}usr" install_library_type/relocatable fi - if use static; then + if use static-libs; then emake prefix="${D}usr" install_library_type/static fi emake prefix="${D}usr" install_gps_plugin diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild index 52ac0776cb56..f67e1a2f877e 100644 --- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild @@ -16,13 +16,13 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline - +shared sqlite static syslog tools" + +shared sqlite static-libs syslog tools" RDEPEND="dev-lang/gnat-gpl:6.3.0 ${PYTHON_DEPS} gmp? ( dev-libs/gmp:* ) gtk? ( - dev-ada/gtkada[gnat_2017,shared?,static?] + dev-ada/gtkada[gnat_2017,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -34,8 +34,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0 postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - >=dev-ada/libgpr-2017[gnat_2017,shared?] - static? ( dev-ada/libgpr[static-libs] ) + >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] )" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2017]" @@ -98,7 +97,7 @@ src_compile() { emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/relocatable fi - if use static; then + if use static-libs; then emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/static fi @@ -113,7 +112,7 @@ src_install() { if use shared; then emake prefix="${D}usr" install_library_type/relocatable fi - if use static; then + if use static-libs; then emake prefix="${D}usr" install_library_type/static fi if use tools; then diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml index 5bc4030a3e0e..df4d11fa0b3a 100644 --- a/dev-ada/gnatcoll/metadata.xml +++ b/dev-ada/gnatcoll/metadata.xml @@ -11,7 +11,6 @@ Adds support for projects Adds support for pygobject Build shared library - Build static library Build associated tools -- cgit v1.2.3