diff options
| author |   Tupone Alfredo <tupone@gentoo.org> | 2017-11-25 16:11:03 +0100 |
|---|---|---|
| committer | Tupone Alfredo <tupone@gentoo.org> | 2017-11-25 16:11:03 +0100 |
| commit | 084b75081845bc83908ed348800cc67f8317cd05 (patch) | |
| tree | d348cc03b30ada8b7aac06138757be9fd7a8571d /dev-ada | |
| parent | net-fs/nfs-utils: Added snapshot release (diff) | |
| download | gentoo-084b75081845bc83908ed348800cc67f8317cd05.tar.gz gentoo-084b75081845bc83908ed348800cc67f8317cd05.tar.bz2 gentoo-084b75081845bc83908ed348800cc67f8317cd05.zip | |
dev-ada/gnatcoll: use gnatls-6.3.0 instead of gnatls
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'dev-ada')
| -rw-r--r-- | dev-ada/gnatcoll/Manifest | 4 | ||||
| -rw-r--r-- | dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch | 23 | ||||
| -rw-r--r-- | dev-ada/gnatcoll/gnatcoll-2017.ebuild | 23 |
3 files changed, 36 insertions, 14 deletions
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest index c8f53f37aaf2..109aacccdc23 100644 --- a/dev-ada/gnatcoll/Manifest +++ b/dev-ada/gnatcoll/Manifest @@ -1,2 +1,2 @@ -DIST gnatcoll-gpl-2016-src.tar.gz 5687584 SHA256 8cc7cc01db548447a78e3d6d35a35867514beb625009abbcd3be124c1e259b3b SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a WHIRLPOOL d37c12bb6242d92104e89b7c1d9a9cd94d802137ee32faa58687700a822db69e2739372376d12032228843c2a5356f8085d6072715b8bc1bda411039d20b55f5 -DIST gnatcoll-gpl-2017-src.tar.gz 5785988 SHA256 66168ee795a67dde3b8a8d0fe6663a776d1bdf50091e6cdd47f3837d89afd434 SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 WHIRLPOOL a0fbda792b282ecb184057efa98332f0b790c9412ba6fec541fbcb8c57cab48f64df6ff81017c283e599cda858d668f5f8fcf5b7bd771c23f34a84a6d16f4c79 +DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a +DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch index 2c3efd2c29f0..ecec0b784589 100644 --- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch +++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch @@ -222,3 +222,26 @@ end Compiler; package Linker is +--- gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads.old 2017-11-25 14:50:06.919939453 +0100 ++++ gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 +@@ -1917,7 +1917,8 @@ + Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access; + -- The list of source files in Predefined_Source_Path + +- Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls"); ++ Default_Gnatls : GNAT.Strings.String_Access := ++ new String'("@GNATLS@"); + -- The default gnatls command to run. + + Xrefs_Subdir : GNAT.Strings.String_Access; +--- gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb.old 2017-11-25 14:52:47.282170250 +0100 ++++ gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb 2017-11-25 14:52:57.691990254 +0100 +@@ -642,7 +642,7 @@ + GNAT_Version : GNAT.Strings.String_Access; + begin + Env.Set_Path_From_Gnatls +- (Gnatls => "gnatls", ++ (Gnatls => "@GNATLS@", + GNAT_Version => GNAT_Version, + Errors => Local_On_Error'Unrestricted_Access); + Free (GNAT_Version); diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild index 1be618293414..2064ea175d36 100644 --- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild @@ -18,12 +18,11 @@ KEYWORDS="~amd64" IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline +shared sqlite static syslog tools" -RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) +RDEPEND="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_2017,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -35,31 +34,31 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) postgresql? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - >=dev-ada/gprbuild-2017[gnat_2016=,gnat_2017=,shared?,static?] + >=dev-ada/gprbuild-2017[gnat_2017,shared?,static?] )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=]" + dev-ada/gprbuild[gnat_2017]" REQUIRED_USE="${PYTHON_REQUIRED_USE} - pygobject? ( gtk ) - !gnat_2016 gnat_2017" + pygobject? ( gtk )" S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { + GCC_PV=6.3.0 default mv configure.{in,ac} || die + sed -i \ + -e "s:@GNATLS@:gnatls-${GCC_PV}:g" \ + src/gnatcoll-projects.ads \ + src/tools/gnatinspect.adb \ + || die eautoreconf } src_configure() { - if use gnat_2016; then - GCC_PV=4.9.4 - else - GCC_PV=6.3.0 - fi GCC=${CHOST}-gcc-${GCC_PV} GNATMAKE=${CHOST}-gnatmake-${GCC_PV} GNATCHOP=${CHOST}-gnatchop-${GCC_PV} |