diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
| commit | b2be182d49eea46686b5cf2680d457df61e89dc4 (patch) | |
| tree | c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-ada/gnatcoll-bindings | |
| parent | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff) | |
gentoo resync : 30.06.2018
Diffstat (limited to 'dev-ada/gnatcoll-bindings')
| -rw-r--r-- | dev-ada/gnatcoll-bindings/Manifest | 2 | ||||
| -rw-r--r-- | dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild | 28 |
2 files changed, 14 insertions, 16 deletions
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest index ceda2896b36f..e106c7d9a497 100644 --- a/dev-ada/gnatcoll-bindings/Manifest +++ b/dev-ada/gnatcoll-bindings/Manifest @@ -1,4 +1,4 @@ AUX gnatcoll-bindings-2018-gentoo.patch 395 BLAKE2B 2815a837cf68eb545c35d46d70b24fab8664580457f1525784c83519918984e225bde66a93c336f88f87ac0d6436229f350fa3b6e2d2f7bf2c37dd3bc55aa771 SHA512 e6511dac4d89c8751a0806495459de9d691a2136010ad4e6be31413a86659e286a6abcb53340dc22df2714eec925f26b7b222e63bd292e9689baa50a9a205d0c DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295 -EBUILD gnatcoll-bindings-2018.ebuild 2134 BLAKE2B 7ffaeb17532de03669e737f6e556324f0864a90bcbcbc9b16262b4ab42d8c6d729df5118a873643f7b736c8f8e7e0a63642f39c038ed6fc212ec029f93c8863a SHA512 628b9f865bdfd1834c4e3cc0b7b488eb1586d8788966197f4bfaf9d353d38fab6f19f426de8c3662e53addb619d0a4a313aa88c900c349ea5aa7f98188beabad +EBUILD gnatcoll-bindings-2018.ebuild 2070 BLAKE2B ce662822fdbf11f440711993e4ac913bc43f6dd481930491f2c465a44025aaa7102ba8e3ca790d83826776ccbaf0c3532fb503ec7cd472daaade2620acbb77f0 SHA512 299300f491cc4e65723b7c8c494bc3d8367c9b5c496f867173286376e9269797e98ef8f7467b2eed81514f39c50cbf0fefd64c9acdf633a5531ea3ea74cc72f6 MISC metadata.xml 1317 BLAKE2B 99ea5cb11a8d16c2cde5c902f68f515b2a337d2753453405f2747c72e1d15ba597991ed2bc8d842d1ff127be653d9e59c9e18eec8e034bd5a3bb3726a8ed35a2 SHA512 833bd43bb77645561af5df8ebe904e1b2354ca4be7915aa0fdbe6f6986b116cb8850d91d36bfb1bfd520e037ce93eb206b86488939840e2f64e714f5c1daa083 diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild index 238c3d8a2042..4cc7fcaf6a9b 100644 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild +++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild @@ -18,30 +18,28 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared static-libs static-pic syslog" -# gtk iconv postgres pygobject projects sqlite tools RDEPEND="python? ( ${PYTHON_DEPS} ) - dev-ada/gnatcoll-core[gnat_2018,shared?,static-libs?,static-pic?] - dev-ada/libgpr[gnat_2018,shared?,static-libs?,static-pic?] - dev-ada/xmlada[gnat_2018,shared?,static-libs?,static-pic?] - dev-lang/gnat-gpl:7.3.0 + dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] + dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )" - DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2018]" + dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - !gnat_2016 !gnat_2017 gnat_2018" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) !gnat_2016" S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_compile() { - GCC_PV=7.3.0 - GCC=${CHOST}-gcc-${GCC_PV} + if use gnat_2017; then + GCC_VER=6.3.0 + else + GCC_VER=7.3.1 + fi build () { - GCC=${CHOST}-gcc-${GCC_PV} gprbuild -j$(makeopts_jobs) -m -p -v \ + GCC=${CHOST}-gcc-${GCC_VER} gprbuild -j$(makeopts_jobs) -m -p -v \ -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \ -XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \ -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \ @@ -62,9 +60,8 @@ src_compile() { src_install() { build () { - gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr \ - -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr \ - --build-name=$2 + gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \ + -XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2 } for kind in shared static-libs static-pic ; do if use $kind; then @@ -77,5 +74,6 @@ src_install() { done fi done + rm -r "${D}"/usr/share/gpr/manifests || die einstalldocs } |