summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/Manifest.gzbin17850 -> 17854 bytes
-rw-r--r--dev-lang/lua/Manifest2
-rw-r--r--dev-lang/lua/lua-5.1.5-r4.ebuild4
-rw-r--r--dev-lang/perl/Manifest9
-rw-r--r--dev-lang/perl/files/perl-5.26.2-hppa.patch105
-rw-r--r--dev-lang/perl/perl-5.26.2.ebuild4
-rw-r--r--dev-lang/perl/perl-5.26.9999.ebuild4
-rw-r--r--dev-lang/perl/perl-5.28.0.ebuild4
-rw-r--r--dev-lang/perl/perl-5.28.9999.ebuild4
-rw-r--r--dev-lang/ruby/Manifest8
-rw-r--r--dev-lang/ruby/files/2.6/005_no-undefined-ext.patch11
-rw-r--r--dev-lang/ruby/files/2.6/009_no-gems.patch39
-rw-r--r--dev-lang/ruby/ruby-2.4.5.ebuild2
-rw-r--r--dev-lang/ruby/ruby-2.6.0-r1.ebuild (renamed from dev-lang/ruby/ruby-2.3.8.ebuild)110
-rw-r--r--dev-lang/rust-bin/Manifest4
-rw-r--r--dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild2
-rw-r--r--dev-lang/rust-bin/rust-bin-1.31.1.ebuild2
-rw-r--r--dev-lang/rust/Manifest4
-rw-r--r--dev-lang/rust/rust-1.30.1-r1.ebuild2
-rw-r--r--dev-lang/rust/rust-1.31.1.ebuild2
-rw-r--r--dev-lang/tk/Manifest3
-rw-r--r--dev-lang/tk/files/tk-8.6.9-conf.patch11
-rw-r--r--dev-lang/tk/tk-8.6.9.ebuild145
-rw-r--r--dev-lang/vala/Manifest6
-rw-r--r--dev-lang/vala/vala-0.36.13.ebuild40
-rw-r--r--dev-lang/vala/vala-0.36.14.ebuild40
-rw-r--r--dev-lang/vala/vala-0.36.15.ebuild2
27 files changed, 406 insertions, 163 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 7650a342d671..7e2ae7ee839f 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 0a07d86da321..eefd2362bbc7 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -27,7 +27,7 @@ DIST lua-5.3.3.tar.gz 294290 BLAKE2B 8052d3fa5f34636df314886a62d63e46fc76ada7656
EBUILD lua-5.1.5-r100.ebuild 3759 BLAKE2B 191eb7aef48ba9b8e08254e1e7717e47a48ddbc21810274b3063c8d0d98790dd0da1bfe52128e1da5472285dc89c3f9770cb5b02a0121316c16121df5f1161dd SHA512 7191cf605f57063dabeb201f9fb747d0df1c4b7b9ede34bec21d8e0f0eeb8edebc4be82f7157a8b23b18f352f5b07bb03a83cd645856e6a019fcd5c2bd0c990a
EBUILD lua-5.1.5-r101.ebuild 4020 BLAKE2B 9c151be5dd2bcbd340280f647e55d3db580b3e56367b3a18924e35223f9ccb9d4f9f2e05bd41ec8dd43e984bb28afd12bfe02a569776216d9dc78e518c32ba06 SHA512 16ef9fa4f9036aa7ab9683d3cf25cd3015fafbea13248b51d65ea47ceddd2c5ed378d5b5df36fd87398c5220389ae08c08103aa4ae789a03412ec7f4b6501a02
EBUILD lua-5.1.5-r102.ebuild 4020 BLAKE2B b357a5e5f7831d6c98d716f651c4bfa2ebb8e2377a9e1c5be64f4eb0da6e818e2146feacd0e38328cf5ee9b66827b25795a70cb273a8a32ccb576abada6f0bdb SHA512 ace218026ab6fef8b758d6c9a2a6ab5126fbedf5a1bf6a8d3402c2e5c4423f56613bfd71226d7423e8e457d68eda03fb653226812399bbad45ccd1cc146489d3
-EBUILD lua-5.1.5-r4.ebuild 3654 BLAKE2B 128f6ef3404aa231626dd7ee14e777a4b67a78ad2133db0f50269636b87e876f433cf526398ab4520c46e1c3d31787185a53515b16c69cddf7bd6fd0ef860ead SHA512 1f2f70d49cbb1934442812d8f1cbab485e097585118aaf41500041832681dc4cf54a7ecdb4ac18c9403444842dfb5484e20e7716d68f1f54d97b2b5454543283
+EBUILD lua-5.1.5-r4.ebuild 3650 BLAKE2B 766d8a5ef66db5e765091241ca5de32cb475052e8a6612fcf4f5c57d1b45262103aa296f2d208ae129abc37b7082c2ff701bc0a063b1b1784c0151c05efcad13 SHA512 fcb3f035652253697429fc4893ad7e8fe5ee53dbeb27897272f3ff145b91180f6896fbb1e2b670e27f338e6f86ed041bdb1c39971d07935e18814a7438f23e0e
EBUILD lua-5.2.3-r1.ebuild 3782 BLAKE2B e600a525fa3762916ce36307969d15e97155df36aff7d4ef9f9e540811d7fbdbfe82b40252bc7681e11350613c933e7d1c2c37796a2f21157e8996aa44b43826 SHA512 1f682778d613ed1bb9f56122d156e616a8e03e6de647d52362263f37f459e7ce785e9d7491bf2139cdedf60a6466699e6562ae394a6a9e11a1ba4fbcfa157659
EBUILD lua-5.2.3-r2.ebuild 4043 BLAKE2B a257fca93afc3dfda9e41e2222c40eb6cfb9f7cd221ab6b499c72273f90bdb5ae5e1a11e0b75c2b097c110565817124093b23da6ae5702552e6be43ac924da80 SHA512 2e7604989198e659d96fc807e820a118639a870f78bcacc18c8e87446252d8cb9d3fae4edc04f57448efbc92edaac104f296fd61321ded4c8fd7b1a983c63047
EBUILD lua-5.2.3-r3.ebuild 4043 BLAKE2B 06127a7c35a4dc1ec47b0fb447fd1dd265625ef92da2427b8f09f82dec9aab0726c36b88f254b7a6aff6a2916c723c49f800db64b6b74859c01346dcbd2a1a4c SHA512 4bf9770781c348e3a71203a341c39a37b2a32804b2ce1304ed41fb39ff25a916d0729183bce49f994d8ca44c9c79dfb9c72501ad3d0ba2dc9ee21dad48c814e5
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild
index 66f44b575298..4917c1a92275 100644
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 7e525f7cb93c..b9ef3ab9b929 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,4 +1,5 @@
AUX perl-5.24-libnsl.patch 613 BLAKE2B 3d802f2d9203765630690a12dce5bc339dc0ec3531b47d23cb27877d1159d74b4c0c225fb21fb71257a3b125b72008f6a9b2d174fcd66e3b80f271abccc6f6f2 SHA512 19241053ecb83f5427a7361d222d87ba20c7cc59b2c6cdff011e4f9c59d828e703f0de17dcebb886772278c8dd269bf2b95978a2dededc0bf4ef9056733a3ed4
+AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065c052ca048ec17c06fa90049eb7fd5ae40092f11248de25cdf9cff96dc69626e7f3269b24cf618004deeb5859 SHA512 24856ae3c637c58d16d543240f5028e137c33c7aeae7c0c3dfa1a69b621057a84ab4ddf8b12ac6ef251381af4b190c200262bec9bdaa6001199dbd1d15cf4bae
DIST perl-5.24.3-patches-2.tar.xz 23980 BLAKE2B 5de7ac2cc5238d0b8460a294ae2e8da1455f89a63691a4fc022d49756ed4c0e577672149de7bd475d10f4860b4a98dc1db0c6f32abaf80f8c04658f6ca706e11 SHA512 f13c5fac65e11d691b77231cc98b0a57b6ccabd66535835bc387410dc88c298d31fa471bcd9f4e86d4d51b0402483283c23dcd53d69e0dbabc77b9db6fea4936
DIST perl-5.24.3.tar.xz 11574740 BLAKE2B 79e719d1d0fcea3eea71653f276d0d093d8d1f6b1f981b053f25e6891c57af9ee1982f65ce4a31e4c5844eb11a7966f25c6b459cc7de51cf62b9127be96f6f25 SHA512 139c92c0ea0ee7bd5912ad52cc275e0732ceb0865d8b67c301e1fc5a96ae126a26432b4450a2bbc7fe65b8e1dd8adde92ea2cc91ee39cb13ec3c5096e8f787ec
DIST perl-5.24.4-patches-1.tar.xz 24244 BLAKE2B aa4557a887e57d584c738058ed147f1b4f80f491223e1476c16abdc371bbe133f5d99ea3be11e44101b5343680823ab29c5d26cc8a8ca222275ba4bc092cd5d9 SHA512 465f22269d6c07be5616de223c712ab57d7060fdb4fcc4d79ab23aae79fa61517dbed112bb3a2541d3368a02d046b769ef8fa50a7b91379ad03ca4bf3387e518
@@ -15,8 +16,8 @@ EBUILD perl-5.24.3-r1.ebuild 17393 BLAKE2B 999d7df269e15390e4f7d146ff94eda530198
EBUILD perl-5.24.4.ebuild 17363 BLAKE2B 84744ba06ce9dc0cab51aae3da10917679a20b5997f13154c269285173a6c6b0ec20ae365b059daa52f86f2addcf97dbe8866a29cd2c9c32ee51030de9a44bf7 SHA512 d393349752cfcdb53bd6d99559ad1eb5385e716f772bc4377e07bc3d7064a293e5cc0369feca2094513e710e8724c2a0a82fcf342ad68c4e1d2c1d0d42200071
EBUILD perl-5.26.1-r1.ebuild 19255 BLAKE2B a29acfd3ea358d0d46886aae104acf8e55ad7c9380848343ad84dfc58294645fa6c72c4cbc598e54072585f880175581ef25e7e6e2a9080764968ab925cdbb9d SHA512 4630da50892ac674de4b9e5858ffd9b1c50b08558a91a1579958f728aaf3d9581b3f960c0d9caf5a460c3435a626c9294d8abc73c7f7da098199018a144a5788
EBUILD perl-5.26.1-r2.ebuild 19668 BLAKE2B 5936c92398cf8a889bd946705f2667abd07fc81a64ea3f8c44cd83f3c29719352f4ea938b8d7fb7e3d5d138dcba12f94692166aaca8d98a3640c772850ec9e5c SHA512 154b021e91b01ecd55a5af50bc530f080745b122cd5a77652589c236d4bceea93f4379a1c8e751eb1787118e3133e1f5daab8dccf88365f7976c8a015591190e
-EBUILD perl-5.26.2.ebuild 19946 BLAKE2B dab57a37146c65c67df2dd225e0b591f9e83e82d2c806687a7a9f7889350e93d0232be299875229a4b1e49044ced9f271b9ca89f05dbaf952887b97a11aee2d8 SHA512 cdc5b46b02b3dd6f0dbf73647041f5995792e19caaf3b0eda6031794f018f1946d14d510d2c8cddbe7e6a7e8ca39aef38ef1ba7760e2b67b073147909d196208
-EBUILD perl-5.26.9999.ebuild 19946 BLAKE2B dab57a37146c65c67df2dd225e0b591f9e83e82d2c806687a7a9f7889350e93d0232be299875229a4b1e49044ced9f271b9ca89f05dbaf952887b97a11aee2d8 SHA512 cdc5b46b02b3dd6f0dbf73647041f5995792e19caaf3b0eda6031794f018f1946d14d510d2c8cddbe7e6a7e8ca39aef38ef1ba7760e2b67b073147909d196208
-EBUILD perl-5.28.0.ebuild 20135 BLAKE2B 24983e5fa8c94f4348445f4e6ad0ff7bb05e252b3cf9df15449e7230c45a1d49c4b5b6f1755f19950448d342aac6c5f2e6ad9603c18a979d65a39a9cc09c4b98 SHA512 aeb037ab4f3ebdd3c3297248a74fef91be34af020979a8a7a53e19006687011530fe362d41624270fbcbd7565f1343e32d08466e06a29dd96f30d5653d273398
-EBUILD perl-5.28.9999.ebuild 20135 BLAKE2B 24983e5fa8c94f4348445f4e6ad0ff7bb05e252b3cf9df15449e7230c45a1d49c4b5b6f1755f19950448d342aac6c5f2e6ad9603c18a979d65a39a9cc09c4b98 SHA512 aeb037ab4f3ebdd3c3297248a74fef91be34af020979a8a7a53e19006687011530fe362d41624270fbcbd7565f1343e32d08466e06a29dd96f30d5653d273398
+EBUILD perl-5.26.2.ebuild 20031 BLAKE2B d6e3d8053ddbe6b3bd6fad32c2453b996ac5aea5d854354540bf3de7bd55cb2282f6c72122928d037318c5f6d54755b45f56a52ea8704c3fc4824f70a2776b9c SHA512 11d55af2d0f4ea7546b0633e4056e2cc3699b75061c4ba80e0bd17be358c9ea4900b780089853bef21718f6101257b0a9f9e15624b609332c10831d8f02bdb44
+EBUILD perl-5.26.9999.ebuild 20031 BLAKE2B d6e3d8053ddbe6b3bd6fad32c2453b996ac5aea5d854354540bf3de7bd55cb2282f6c72122928d037318c5f6d54755b45f56a52ea8704c3fc4824f70a2776b9c SHA512 11d55af2d0f4ea7546b0633e4056e2cc3699b75061c4ba80e0bd17be358c9ea4900b780089853bef21718f6101257b0a9f9e15624b609332c10831d8f02bdb44
+EBUILD perl-5.28.0.ebuild 20220 BLAKE2B a6e1e9d5e94f128dbb8e3c8859ed41a48cb0ec311104901d854144cbc854986dcbd8bcbe5dc78d26a5e5877eb422d1a6a203566f0fe7a6efd71b69f1a9925796 SHA512 c156b1b6ed7aaf836b4d281d844f62583ae823225903b0da0e4941e26dc1e631e5468074fb42217de27ef3d8582e911f0fbb33495e38342019d6975cdc11aaad
+EBUILD perl-5.28.9999.ebuild 20220 BLAKE2B a6e1e9d5e94f128dbb8e3c8859ed41a48cb0ec311104901d854144cbc854986dcbd8bcbe5dc78d26a5e5877eb422d1a6a203566f0fe7a6efd71b69f1a9925796 SHA512 c156b1b6ed7aaf836b4d281d844f62583ae823225903b0da0e4941e26dc1e631e5468074fb42217de27ef3d8582e911f0fbb33495e38342019d6975cdc11aaad
MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/files/perl-5.26.2-hppa.patch b/dev-lang/perl/files/perl-5.26.2-hppa.patch
new file mode 100644
index 000000000000..83ed944353e5
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.26.2-hppa.patch
@@ -0,0 +1,105 @@
+https://bugs.gentoo.org/634162
+
+Source:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869122
+
+Index: perl-5.26.0/op.c
+===================================================================
+--- perl-5.26.0.orig/op.c
++++ perl-5.26.0/op.c
+@@ -14832,6 +14832,7 @@ Perl_custom_op_get_field(pTHX_ const OP
+ SV *keysv;
+ HE *he = NULL;
+ XOP *xop;
++ XOPRETANY any;
+
+ static const XOP xop_null = { 0, 0, 0, 0, 0 };
+
+@@ -14874,58 +14875,37 @@ Perl_custom_op_get_field(pTHX_ const OP
+ else
+ xop = INT2PTR(XOP *, SvIV(HeVAL(he)));
+ }
+- {
+- XOPRETANY any;
+- if(field == XOPe_xop_ptr) {
+- any.xop_ptr = xop;
+- } else {
+- const U32 flags = XopFLAGS(xop);
+- if(flags & field) {
+- switch(field) {
+- case XOPe_xop_name:
+- any.xop_name = xop->xop_name;
+- break;
+- case XOPe_xop_desc:
+- any.xop_desc = xop->xop_desc;
+- break;
+- case XOPe_xop_class:
+- any.xop_class = xop->xop_class;
+- break;
+- case XOPe_xop_peep:
+- any.xop_peep = xop->xop_peep;
+- break;
+- default:
+- NOT_REACHED; /* NOTREACHED */
+- break;
+- }
+- } else {
+- switch(field) {
+- case XOPe_xop_name:
+- any.xop_name = XOPd_xop_name;
+- break;
+- case XOPe_xop_desc:
+- any.xop_desc = XOPd_xop_desc;
+- break;
+- case XOPe_xop_class:
+- any.xop_class = XOPd_xop_class;
+- break;
+- case XOPe_xop_peep:
+- any.xop_peep = XOPd_xop_peep;
+- break;
+- default:
+- NOT_REACHED; /* NOTREACHED */
+- break;
+- }
+- }
++
++ if(field == XOPe_xop_ptr) {
++ any.xop_ptr = xop;
++ } else {
++ const U32 flags = XopFLAGS(xop);
++ switch(field) {
++ case XOPe_xop_name:
++ any.xop_name = (flags & field) ? xop->xop_name : XOPd_xop_name;
++ break;
++ case XOPe_xop_desc:
++ any.xop_desc = (flags & field) ? xop->xop_desc : XOPd_xop_desc;
++ break;
++ case XOPe_xop_class:
++ any.xop_class = (flags & field) ? xop->xop_class : XOPd_xop_class;
++ break;
++ case XOPe_xop_peep:
++ any.xop_peep = (flags & field) ? xop->xop_peep : XOPd_xop_peep;
++ break;
++ default:
++ NOT_REACHED; /* NOTREACHED */
++ break;
+ }
+- /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
+- * op.c: In function 'Perl_custom_op_get_field':
+- * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
+- * This is because on those platforms (with -DEBUGGING) NOT_REACHED
+- * expands to assert(0), which expands to ((0) ? (void)0 :
+- * __assert(...)), and gcc doesn't know that __assert can never return. */
+- return any;
+ }
++
++ /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
++ * op.c: In function 'Perl_custom_op_get_field':
++ * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
++ * This is because on those platforms (with -DEBUGGING) NOT_REACHED
++ * expands to assert(0), which expands to ((0) ? (void)0 :
++ * __assert(...)), and gcc doesn't know that __assert can never return. */
++ return any;
+ }
+
+ /*
diff --git a/dev-lang/perl/perl-5.26.2.ebuild b/dev-lang/perl/perl-5.26.2.ebuild
index e2af84bf47de..3efe8267e5be 100644
--- a/dev-lang/perl/perl-5.26.2.ebuild
+++ b/dev-lang/perl/perl-5.26.2.ebuild
@@ -307,6 +307,10 @@ src_prepare() {
local patch
EPATCH_OPTS+=" -p1"
+ if use hppa ; then
+ epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
+ fi
+
if [[ ${CHOST} == *-solaris* ]] ; then
# do NOT mess with nsl, on Solaris this is always necessary,
# when -lsocket is used e.g. to get h_errno
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index e2af84bf47de..3efe8267e5be 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -307,6 +307,10 @@ src_prepare() {
local patch
EPATCH_OPTS+=" -p1"
+ if use hppa ; then
+ epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
+ fi
+
if [[ ${CHOST} == *-solaris* ]] ; then
# do NOT mess with nsl, on Solaris this is always necessary,
# when -lsocket is used e.g. to get h_errno
diff --git a/dev-lang/perl/perl-5.28.0.ebuild b/dev-lang/perl/perl-5.28.0.ebuild
index a88e2d54acf9..13cbdc3c0050 100644
--- a/dev-lang/perl/perl-5.28.0.ebuild
+++ b/dev-lang/perl/perl-5.28.0.ebuild
@@ -307,6 +307,10 @@ src_prepare() {
local patch
EPATCH_OPTS+=" -p1"
+ if use hppa ; then
+ epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
+ fi
+
if [[ ${CHOST} == *-solaris* ]] ; then
# do NOT mess with nsl, on Solaris this is always necessary,
# when -lsocket is used e.g. to get h_errno
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index a88e2d54acf9..13cbdc3c0050 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -307,6 +307,10 @@ src_prepare() {
local patch
EPATCH_OPTS+=" -p1"
+ if use hppa ; then
+ epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
+ fi
+
if [[ ${CHOST} == *-solaris* ]] ; then
# do NOT mess with nsl, on Solaris this is always necessary,
# when -lsocket is used e.g. to get h_errno
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 11e7f2aa58e8..a2180fc1bf2e 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -8,14 +8,16 @@ AUX 2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch 2501 BLAK
AUX 2.5/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8
AUX 2.5/009_no-gems.patch 3454 BLAKE2B f2439a799776c39ba16f1503d573c90ea6d74fc2bad3b3874a961add6b605bb064c683080a4258ed1a0e83bca5cb67c02ba68bceb6acea7613ab7166e16a2f4c SHA512 bef8b2763993755b5b6ccba0b5cbe002fd721405d7c274f421ae3d95fa4d0d99cdf946f5fa9a907cac2c3696b2cc23f2f2e030b3a70eca93081e49b02f25a072
AUX 2.5/010-libressl_2.7.patch 638 BLAKE2B 53f5f5d275e2c5482a608a947a1b3c41e9dcdd1763cc57a075e3abd536567852387506ec0ce2f5f49f5eed2246ca9f860d56637a9f18cd17cd49fff6fc92d340 SHA512 986aff99fd35814c94581cdc169cfc5a5f75c87889db5556941809ecaf878b6af838afe2ee108dd7147ea70be6fe9e47f98cce3c1804af0a34f7c1aab8c13d89
+AUX 2.6/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8
+AUX 2.6/009_no-gems.patch 1261 BLAKE2B 359d0a73c374e5c464eb0343d33272244bb88ba200977007a93f3c3c776779a013174fc2c97717e4ae4a1495011d3baae80e68b07433eab1320955a49aed8b59 SHA512 1607b9c2021e5b5f08cf28c64d3f3ddd077bc47df02a353182a9bc70dc6831ea18e8681d9808bb6841939d64082ae4966081014ee110d2090ec67ffe8faa9b8b
DIST ruby-2.3.8.tar.xz 11465792 BLAKE2B b9c8ef5c943872e3d1426c30cbd720acc66d17cc7bc926f3294e68f17fbc78edef42f6496295800c3d4efd3ae441730723bfcfbc1111e46239359930622697d9 SHA512 06373050e6c1af9cb6a5863aef878b21c8a45fd0e68414e3d546cb73ec3028207d3acc0a9326428f172b9347a30bbe69a16f9dc0bdb739161d677adb2d888095
DIST ruby-2.4.5.tar.xz 10064712 BLAKE2B 0846125e617b43ea302b4c5309b20503577937865d445a6fee766323a188aa552d3a13740c3d38c7be812b19bffb2474021cb7b368cc144d51ea771552f62769 SHA512 658f676c623109f4c7499615e191c98c3dd72cfcaeeaf121337d0b8a33c5243145edd50ec5e2775f988e3cd19788984f105fa165e3049779066566f67172c1b4
DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518
+DIST ruby-2.6.0.tar.xz 11918536 BLAKE2B f51fe57c1ff83d99c834f29d1bcc8e847f7a4cd3a10e202391327373d9d803fcc356d210cc07b9038915039a7462c0263fa7567b63366d1ab6273b9a82e651d1 SHA512 c56eaf85ef7b79deb34ee4590b143c07f4fc83eb79775290761aee5a7c63374659613538a41f25706ed6e19e49d5c67a1014c24d17f29948294c7abd0b0fcea8
DIST ruby-patches-2.3.8-r1.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
-DIST ruby-patches-2.3.8.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
EBUILD ruby-2.3.8-r1.ebuild 6877 BLAKE2B aa01c8cecf39d0ff2f221d4b51a79d258df1a31687bb3b18154ffd4b998fe73e43304339eb3d49ed6b691ac96cb821730c866a180d4199d8659dc53b24a43790 SHA512 03bfc466d6f8890c353056d702c9af7c0dd789606d3f7b3f83b087ab5bdb619fafcf6fd1021e73b5f37b78fa9214b9a473ba2b3619ea7e51a13fe2d35ad7cce0
-EBUILD ruby-2.3.8.ebuild 6873 BLAKE2B 2566082717e130c2f982b5b7e0abd8791636de6321b8b27684b1da935138dde506069d2214cbfb7d3961550a2a0063093121f812951538b3fbb21a61586f0940 SHA512 c078fd91363fb0e7650bf3c6764e409be364a029ac1d3389e37b101137f8a6a59ffebc50c81c658de044ae8977bb1808ffa9f19b77524623d944f33097b1d159
EBUILD ruby-2.4.5-r1.ebuild 6631 BLAKE2B 11b247fb28a2e0eb9d9997829327991b6bb730fde51bbf6e68c2136cefa8c99c3193ebe60cac8dacb37f967af69293b2b18515638ba01a6fde9e4eb2efcd20ce SHA512 0780e2d9c06967e1d6184909b553a90d20341741a5a66ccc3096fc72b6758af6c6d66822618839d9c0fc898424cbbab8f9b4de29109ca9bf01ba103baf88cf21
-EBUILD ruby-2.4.5.ebuild 6622 BLAKE2B 0d590e9943a698ebd1f8a71b77985492988b5b0ff12868c2723117d1d63dcf4947fb7e48d5b7685f591c76db4d4efed542ff64266ced865de721dab6719daeed SHA512 ca1a75ae41fc1dea9a8a774d56743b00fc553ac76a44954637deeb8f73797fd4f694ac37d01fff3754166b9643a30b2305897c8fc1a06f9612f4169fa31ba3cf
+EBUILD ruby-2.4.5.ebuild 6617 BLAKE2B adcef1d6173667bccb066244400be4d9ee9e309790a6312f38b06a4074eb66b044e2a350930bbb47b281cdc547814aebc98d5c50ba815c53615b463653449cea SHA512 33be7e1798cb2008914d49dce2de371cff94be22c46f69fb8d4f5483e97502671bddb0c08c2041d31f6a408fe39537e25a9e5febc7a00406afd2318dfaa5530f
EBUILD ruby-2.5.3.ebuild 6419 BLAKE2B 197a536b058b026cd0fa211fe4a391e4deb617d047e4ca200e5674383b94aa3d1dbccc56235303ae7caa8e405939a0e3211e6e4110cb52ae513c824ce969c8b1 SHA512 8b366d49c0e23dc5c1b1554db2238c084e39ac37d89f8a71b6c5e40b8e1025712de118ce622631f93081589c49dbcb543883ed0629d6a0b4925c18bc81b2c26d
+EBUILD ruby-2.6.0-r1.ebuild 6858 BLAKE2B 6a7350189f7a1809e495389cc49759f6be33677d3e43274522cb9bc38485d1f34b08f24f30f0e516a5509fc24ffc83351134ad7c0be568c55e2596beaa92ce0e SHA512 b1c16bb76b21b5ff2219880d81629f7151b4a4ba51ee1e8b733e5df625c1d0a7492b093167badc7278f2f45aa97f6cbacc7e3cf3fd71f9c457dca1e37cc8204c
MISC metadata.xml 824 BLAKE2B e426ed390cdea118f3301d329ce93729095bafb0a04db9a64edfd709251d6f16f91153d56976f99b82d7a9df4a452513d65593732ccbd7f71332870b52f369a7 SHA512 b6f4fab5888fb9605164d7f627edc86514ec2f83d9dd8c74003ccc5a0d9b6a306986930e027e81f09928fc7ac6677a7de58cebf75c31c2ada73e2a506a447453
diff --git a/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch b/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch
new file mode 100644
index 000000000000..1f0fdda08da5
--- /dev/null
+++ b/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac.~1~ 2017-12-15 10:43:40.000000000 +0100
++++ b/configure.ac 2017-12-25 11:02:19.099076831 +0100
+@@ -3233,7 +3233,7 @@
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
+ : ${LDSHARED='$(CC) -shared'}
+ AS_IF([test "$rb_cv_binary_elf" = yes], [
+- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined"
+ ])
+ rb_cv_dlopen=yes],
+ [interix*], [ : ${LDSHARED='$(CC) -shared'}
diff --git a/dev-lang/ruby/files/2.6/009_no-gems.patch b/dev-lang/ruby/files/2.6/009_no-gems.patch
new file mode 100644
index 000000000000..f98801d50312
--- /dev/null
+++ b/dev-lang/ruby/files/2.6/009_no-gems.patch
@@ -0,0 +1,39 @@
+--- a/tool/rbinstall.rb.~1~ 2018-12-27 07:43:59.938638174 +0100
++++ b/tool/rbinstall.rb 2018-12-27 07:51:09.096382161 +0100
+@@ -723,17 +723,7 @@
+ # :startdoc:
+
+ install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
+- install_default_gem('ext', srcdir) do |path|
+- # assume that gemspec and extconf.rb are placed in the same directory
+- success = false
+- begin
+- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l|
+- break success = true if /^TARGET\s*=/ =~ l
+- end
+- rescue Errno::ENOENT
+- end
+- success
+- end
++ # Gems are unbundled in Gentoo
+ end
+
+ def load_gemspec(file)
+@@ -743,7 +743,7 @@
+ end
+
+ def install_default_gem(dir, srcdir)
+- gem_dir = Gem.default_dir
++ gem_dir = ENV['GEM_DESTDIR'] ; puts "gem_dir for default gems = #{gem_dir}"
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
+ prepare "default gems from #{dir}", gem_dir, directories
+
+@@ -777,7 +777,7 @@
+ end
+
+ install?(:ext, :comm, :gem, :'bundled-gems') do
+- gem_dir = Gem.default_dir
++ gem_dir = ENV['GEM_DESTDIR']
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
+ prepare "bundled gems", gem_dir, directories
+ install_dir = with_destdir(gem_dir)
diff --git a/dev-lang/ruby/ruby-2.4.5.ebuild b/dev-lang/ruby/ruby-2.4.5.ebuild
index 20cb8ae1e078..d42c9f75e2ab 100644
--- a/dev-lang/ruby/ruby-2.4.5.ebuild
+++ b/dev-lang/ruby/ruby-2.4.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.3.8.ebuild b/dev-lang/ruby/ruby-2.6.0-r1.ebuild
index a15c71349c75..ccaa7a4cae2d 100644
--- a/dev-lang/ruby/ruby-2.3.8.ebuild
+++ b/dev-lang/ruby/ruby-2.6.0-r1.ebuild
@@ -1,42 +1,30 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-#PATCHSET=1
+inherit autotools flag-o-matic multilib
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
+MY_P="${PN}-$(ver_cut 1-3)"
S=${WORKDIR}/${MY_P}
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.3.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
DESCRIPTION="An object-oriented scripting language"
HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
RDEPEND="
berkdb? ( sys-libs/db:= )
gdbm? ( sys-libs/gdbm:= )
jemalloc? ( dev-libs/jemalloc )
+ jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
@@ -46,47 +34,47 @@ RDEPEND="
dev-lang/tcl:0=[threads]
dev-lang/tk:0=[threads]
)
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0= )
dev-libs/libyaml
virtual/libffi:=
sys-libs/zlib
- >=app-eselect/eselect-ruby-20151229
- !<dev-ruby/rdoc-3.9.4
- !<dev-ruby/rubygems-1.8.10-r1"
+ >=app-eselect/eselect-ruby-20171225
+"
DEPEND="${RDEPEND}"
BUNDLED_GEMS="
- >=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23]
- >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
- >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
- >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
- >=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
- >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
+ >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
+ >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
+ >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
+ >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
+ >=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
+ >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
+ >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
"
PDEPEND="
${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby23]
- >=dev-ruby/json-1.8.3[ruby_targets_ruby23]
- rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
+ virtual/rubygems[ruby_targets_ruby26]
+ >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
+ >=dev-ruby/json-2.0.2[ruby_targets_ruby26]
+ rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] )
xemacs? ( app-xemacs/ruby-modes )"
src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
+ # 005 does not compile bigdecimal and is questionable because it
+ # compiles ruby in a non-standard way, may be dropped
+ eapply "${FILESDIR}"/2.6/009*.patch
einfo "Unbundling gems..."
cd "$S"
# Remove bundled gems that we will install via PDEPEND, bug
- # 539700. Use explicit version numbers to ensure rm fails when they
- # change so we can update dependencies accordingly.
- rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
+ # 539700.
+ rm -fr gems/* || die
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
+ einfo "Removing bundled libraries..."
+ rm -fr ext/fiddle/libffi-3.2.1 || die
+
+ eapply_user
eautoreconf
}
@@ -119,9 +107,6 @@ src_configure() {
use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
# Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
if ! use berkdb ; then
modules="${modules},dbm"
fi
@@ -131,9 +116,6 @@ src_configure() {
if ! use ssl ; then
modules="${modules},openssl"
fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
if ! use tk ; then
modules="${modules},tk"
fi
@@ -150,17 +132,24 @@ src_configure() {
--disable-rpath \
--with-out-ext="${modules}" \
$(use_with jemalloc jemalloc) \
+ $(use_enable jit jit-support ) \
$(use_enable socks5 socks) \
$(use_enable doc install-doc) \
--enable-ipv6 \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs install-static-library) \
+ $(use_with static-libs static-linked-ext) \
$(use_enable debug) \
${myconf} \
--enable-option-checking=no \
|| die "econf failed"
+
+ # Makefile is broken because it lacks -ldl
+ rm -rf ext/-test-/popen_deadlock || die
}
src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed"
}
src_test() {
@@ -186,29 +175,34 @@ src_install() {
# since they are used during the build to e.g. create the
# documentation.
rm -rf ext/json || die
+ rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
# Ruby is involved in the install process, we don't want interference here.
unset RUBYOPT
local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
- LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+ LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
for d in $(find "${S}/ext" -type d) ; do
RUBYLIB="${RUBYLIB}:$d"
done
export LD_LIBRARY_PATH RUBYLIB
- emake V=1 DESTDIR="${D}" install || die "make install failed"
+ # Create directory for the default gems
+ local gem_home="/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+ mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+ emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make install failed"
# Remove installed rubygems and rdoc copy
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
+ emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die "make install-doc failed"
fi
if use examples; then
@@ -227,13 +221,13 @@ src_install() {
}
pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
eselect ruby set ruby${MY_SUFFIX}
fi
elog
elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(22|23|...)"
+ elog "\teselect ruby set ruby(23|24|...)"
elog
}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index bb92b8e25da1..fb918f9fe9c5 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -45,6 +45,6 @@ DIST rust-1.31.1-s390x-unknown-linux-gnu.tar.xz 127867704 BLAKE2B be4b097506561d
DIST rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz 148394364 BLAKE2B 92b1860f1d0e2da0fc1755a8ed3f6d351da84103220a8fb560e862375b8ad03485299b42ed4448e6f661bb61650480815f20267ffa3d999c2910bc27b80900ae SHA512 3bf37bc419acd7820c7e33d7b44e6cba7f3b556ca8880fee2f65b1648596f069e0bc590a3a7acc10c60a0328f83787a172650d9c26cf21aa14782dcd9a97ec3a
EBUILD rust-bin-1.29.1-r1.ebuild 5626 BLAKE2B 7d27715a7beb483ccf7062437993a36d05a0ed427d8f6774301575b93135382f97edac7fd2bd449e6d6ad6a98793cb09d5d8f27cc037e85c76712a5e1226c071 SHA512 75d18f6228221d9d465dbf32fcccb06246dc93bfddc4f7e54a50871e67f7bb5282e6b2fb1939103572969ea04cff51470a9e44093f5d9aff442ae493489082f2
EBUILD rust-bin-1.29.2-r1.ebuild 4713 BLAKE2B a68d944fcf5c107d1af181d3549423505d65897a2d3ddd2e041f14dceceb3b99e1a9b4552df333b20c7356279befbd5992e41188c4a4351438c5221aae821060 SHA512 befff3078c9a71be9532ba8f0b59899de2bf5c3a3d44189b4daa7cc8f27f7620d010f5e4590ebd663090a5ca3f2bf6bf2016e6b8a392b8f1ea39cf0b7a71afff
-EBUILD rust-bin-1.30.1-r1.ebuild 4462 BLAKE2B 3dd70706a5ea57f57036ccc1bcfae1df69117104e02180888c0807de04bc3dab6cc7955d3ad914492e1512008d931dfc172683acc489d5bcd307098804aadc8f SHA512 9f25a9b17654c5c04c39cb65ada274cb0935f39f3d053b73583893144e694abef992438f223d1491c39548c26ff9f35d986cf94c44b00d56030471492ebe1b88
-EBUILD rust-bin-1.31.1.ebuild 4450 BLAKE2B 79131d08a43a44bbf0e708e8bb7d28aa3519f73710ac3c828358700c9118824f6ee2e537c02cd2af409b416efe79d5d8818dd83bfea20f108378db42650521ed SHA512 9fcd9aebe614c0a79b504d70dcf09e7ea4e02baaa5c472d8ec7dab25bed6c5e01d25e910603e04db2e7300b34f628356316dd7f933a0bcf19d023eb7bc86e2a5
+EBUILD rust-bin-1.30.1-r1.ebuild 4469 BLAKE2B 732a8291f6bfddb716e11750dfcac740df041a61aadc786ab6c0d5f15c9deea823198ca1e9f8967a488a2933e3cf96bb573d689be25f701271d18bc94b0072bb SHA512 6d61ca08852666fc5142f72ec85c73e3cc738f720138657cfc1110ef5728dd14796733544e7d1efb4734c44f4ee2dc74f3c4847380cd055cf91caacc1a14fbe1
+EBUILD rust-bin-1.31.1.ebuild 4457 BLAKE2B c56ea8009e4486dd45585578ebe4273ba9127000baea59a07b09557e82c30eac6745d79ece4cf8b18b7cd7f233b7f7fa66861b0db769d0a8b613cf4099c4b3cc SHA512 f73489c6e9eea818a6f66366f2720381f41324bb2474498da6f3c0b4c6ab3377ba6a8fcc558334494a79fda7a866c5b3fd10f4a44ef0e133672d842d74a03f39
MISC metadata.xml 435 BLAKE2B 5725f771e138720715bb1a5f317bbe0757d981da2059320e5be70583c3a98dcc4fc23141a3b489cdcffa2a53dfaf621b0ee0336a3ca6a05bf7bf8db1b06cf0c3 SHA512 af938d75754d54ed33a87410cdac16fe4b74614e3c5e352c2c1f906137f0a3e96a2eb1036d0aa7b2a17b629b05d44fdf44348b53f7720c770c6e6cae2a715f16
diff --git a/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild
index 570cc004968c..62112a7f3c65 100644
--- a/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.31.1.ebuild b/dev-lang/rust-bin/rust-bin-1.31.1.ebuild
index b2da012da528..5268c1672bb4 100644
--- a/dev-lang/rust-bin/rust-bin-1.31.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.31.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
DEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index f500b9a0f072..65f6077c7245 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -45,6 +45,6 @@ DIST rustc-1.30.1-src.tar.xz 96086232 BLAKE2B 170767b64efe670086e7c4e73838b489a1
DIST rustc-1.31.1-src.tar.xz 96915864 BLAKE2B bedfe1d56e2f99bb43b4b652d540aedf0a86c47b8493f28fb29e5af3135ff469ed40775bc2ee25ac5bd28a264ecba0094d7c9b6aae25ea365ed3e6f354ffa40b SHA512 d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02
EBUILD rust-1.29.1-r1.ebuild 8003 BLAKE2B f6f026fd27037603c83b0b68f5cc202d118322e11fce7448f764f81fcb6f55f26ec0b5d7c484b515e54066ca6c65be2c07b91df0175daf1ea0b4d3ae6c0dc1a3 SHA512 c31e38c3294c11355504e6fc8a5e2e199250cd6d0ab471ec72d08c5f62d31642fb76b1de1b5d0c097af3fd57a9299700ebf39ff01d07e2c06c9b868cbf7db1d6
EBUILD rust-1.29.2-r1.ebuild 7535 BLAKE2B 91d1465b4a5265d019b7cfeeb6b7154e5bce0b83f3d4b36449457875df55823b2319803a68ea59724c6703962471b489af76b773063dbccce84768ae52d61ef9 SHA512 69827d7fd22cfc8fbcdf2885af62c1c9468a8d6afa982fba34435b40430151467fda0715258cb4e3b8db9a861a921dacf5fcd7bd34c3474846516e067fc71931
-EBUILD rust-1.30.1-r1.ebuild 8117 BLAKE2B f1ea10752c355110ef4ffe8876fd41bf00271696f56a01feafdf3d1e45df42ae9f021d912d20c3b94e5347c10760576195140195110270bdf5d8be69aafd6f47 SHA512 8b100db9a2c95e4e32dfa9008aaeb21f50344bedfe2f4e65355e4148bd8d4e5de27f05ae25fc2fb7b3b8e1b467b13f098ec704e41f8238093aaacda22efc2acf
-EBUILD rust-1.31.1.ebuild 8118 BLAKE2B 8aed074dc9c55a0e9ceb357fdc3170306e062ded66c8a4d6521fab6ade58b9a4bf961ada9596cb64cd40f2e4f808c219311e15efa9d89745a2e7d3a55737f833 SHA512 b8bee09b5227114528835e90d3f364e7500eb438a7f41f84eae71e415ef18536a7db884f2fc3d6c6868b3097b4189bb93958a67b5e22e8719e571f3cc3dd9be2
+EBUILD rust-1.30.1-r1.ebuild 8124 BLAKE2B 100ca5a5738c134f1da904761ba96be0f3077bd3478f17de31782d53d1f3917f6c39926ba57758f34d074aca8853fda10691d329865860ab7b3106913a2de6cd SHA512 543eeeb1d91ff60a66b9bfa736b14f6438a89d9008515bb9269f806dda9f41b1a658c1d7d831c2280a3a258736990a27778957580becb2c64e9fe82b2589abc2
+EBUILD rust-1.31.1.ebuild 8125 BLAKE2B c9bac19284931f296c89b1fa050485c2a31b78eb8052197c55e82f4e97821c6b2413ef7733b710b8a71e761a0582305f3b355ce02c0214bf53d907984714240a SHA512 13eae6dfdac268902331ffd50697e28f3a7dae0852429c55ef0fbcd87c2ce8277b84aa31fbf37f3cc42ed6278fdaede0e0cf45decfe05b0cdc489c1746428ea7
MISC metadata.xml 634 BLAKE2B 394e75b1b5b5d9fad1d87dca27d7807bfce9eb723bc339dbb7c0630dc5abd3669e9469a9e75da74925d16d63c78971b0e7c84710db9b2cd15e87d81f49968903 SHA512 9e02acc0ad17e2f502c6082b5df9aeb6b9655783892a85d67855b3f6a79ec36dca610170bb002116c354626d44282c4e35e30cdf6b5e49745cfc6a990f55731c
diff --git a/dev-lang/rust/rust-1.30.1-r1.ebuild b/dev-lang/rust/rust-1.30.1-r1.ebuild
index 3984df3686bb..f0ff75335fab 100644
--- a/dev-lang/rust/rust-1.30.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.30.1-r1.ebuild
@@ -18,7 +18,7 @@ else
SLOT="stable/${ABI_VER}"
MY_P="rustc-${PV}"
SRC="${MY_P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).2"
diff --git a/dev-lang/rust/rust-1.31.1.ebuild b/dev-lang/rust/rust-1.31.1.ebuild
index 1b215c0ac902..22ed3b4a4c0c 100644
--- a/dev-lang/rust/rust-1.31.1.ebuild
+++ b/dev-lang/rust/rust-1.31.1.ebuild
@@ -18,7 +18,7 @@ else
SLOT="stable/${ABI_VER}"
MY_P="rustc-${PV}"
SRC="${MY_P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index bc15f7857be3..abc80b8947dc 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -3,11 +3,14 @@ AUX tk-8.5.11-fedora-xft.patch 681 BLAKE2B b0f095f9a35eb134892c72e0c2adea97a9c3b
AUX tk-8.5.13-multilib.patch 453 BLAKE2B f7c8d90a3aa313e4ebaa6ca3b62a986637e424635a86957f92b594e80dc23dade699f53330f34c960f668d6878e64df239626f9983f90237e4275b3d352b55a6 SHA512 3fccbdea43b13977e04026f9db5a11c2be7d19062a9a008a09ece8e78f78983f79c1ea023562decd1e0a4fc0184045f2ea78da466bb9682f8a9bd214f5c2f4b1
AUX tk-8.5.14-conf.patch 569 BLAKE2B 243b538978966531dcf59f76ffb3d1b82bb10c2d80fc9f31e16165c6f26db96a22ec5953840a316d430153e082e5dd6293edf8f899f0befe60d6e5b1b8ac2279 SHA512 31b53c31253df219d860fc9d067c53379bca571e799a2064e33fb1d9c3f228a001654438eeb5bad5315a6589e7b46f902d87cd54a52d4ed68c0d1d08f24ad544
AUX tk-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457
+AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5ceeecc45c98b27a5386a9b9443af7c329fc422c5249c3da6308552d5c879b5629ae47b705c0d2ddac5534 SHA512 10447a13d597c0917d15089dcfab64165927589ea0fbec7073699788f5ba003e561a6af6562b2ee3e3b40df2f9dc0719c2ca4209a927e506710a390c7a67eb70
DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
+DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
EBUILD tk-8.5.17-r1.ebuild 3566 BLAKE2B a3eae0668b78a075d72b9c8a6751d341d5e021a1cba8d0501fdfb22a25b00095ba289dc46a4bf567e55639172a94dd0401af46651cea11879cdfa367c1e196f3 SHA512 3d09b21189e2cc5016da816ea1fbe99d393704b32aa31a307cdb52bca0d3c91b413031a4ea90b4e52ba12e49cdc22e38d150317b0190243de788a862c83a65b9
EBUILD tk-8.5.17-r100.ebuild 2162 BLAKE2B e4e280058b3059213d10a20fcabcd54a17e74bf78bd6e18ac5acf3a51a3fd870743ea40dc793b6a0ce5ebbfefe9744f26c900542ed511f4ba2d37c404069bc63 SHA512 e0958680ae7beeb6f5ffe06093f27d482c22cba9dfc71fe727425d8fbe4b20e6270b2ddd6e8860b0f7433f84224f8b8251800570ea81f75209146876fd94bda7
EBUILD tk-8.5.17-r101.ebuild 2222 BLAKE2B d632b0304e36ffc9d758efd99fa128c83ab655661d25361c747aff17b9dd16ddadd4386ae9586fa131d6e0288228603232eae7ab24088095e48d60ed8c9772e1 SHA512 82594980647370fbae9201e661024216776b8d1e3fa3d198e5181d99e810f681fb5e4cabc00be41dbcd477c99a80c3a1d8822ef285cf294bded8c41f64d63607
EBUILD tk-8.6.8.ebuild 4116 BLAKE2B dca2259fdb3ae44dcf8f3eb91562b22f9cd8065bc15bad201dee93d868670c13a3026c50e21efa04a8fcb9dfb71b04d824f210914aef85447ac38ce4ed30194b SHA512 ae2c69570844eeee386378ed6b5f66fc8c4dfb2c52a517b8ddf8b65880e600ce7e8cf1fef0e9c04f7e7a549e279f5023d981b5ba2ac82981573aa0265776bb58
+EBUILD tk-8.6.9.ebuild 4030 BLAKE2B c0a38cae7a1dcba81f9f0389a8313f82799340b58203140d0eeb88f5bcb6149f93b840a971129b1f0019747aac07da8adf28c64e0df5dac6d341191f0dc22ee2 SHA512 67067dc795a38f18d4cdb4f3f53f00f493d14804475da0d0b537833ce6988faf22b7ac248821dbe1a1338bef310b5f29336ec3bf7e6195f2c8cb0af97ae95f8a
MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-lang/tk/files/tk-8.6.9-conf.patch b/dev-lang/tk/files/tk-8.6.9-conf.patch
new file mode 100644
index 000000000000..d5b690069c93
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.9-conf.patch
@@ -0,0 +1,11 @@
+--- tk8.6.9/unix/tcl.m4
++++ tk8.6.9/unix/tcl.m4
+@@ -1407,7 +1407,7 @@
+ # get rid of the warnings.
+ #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+
+- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
++ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tk/tk-8.6.9.ebuild b/dev-lang/tk/tk-8.6.9.ebuild
new file mode 100644
index 000000000000..e5fabe6b4be9
--- /dev/null
+++ b/dev-lang/tk/tk-8.6.9.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal prefix toolchain-funcs virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+
+RDEPEND="
+ !aqua? (
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ )
+ ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ !aqua? ( x11-base/xorg-proto )"
+
+# Not bumped to 8.6
+#RESTRICT=test
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch
+ "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+ "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+ "${FILESDIR}"/${P}-conf.patch # Bug 125971
+)
+
+src_prepare() {
+ find \
+ "${SPARENT}"/compat/* \
+ -delete || die
+
+ pushd "${SPARENT}" &>/dev/null || die
+ default
+ popd &>/dev/null || die
+ eprefixify Makefile.in
+
+ # Make sure we use the right pkg-config, and link against fontconfig
+ # (since the code base uses Fc* functions).
+ sed \
+ -e 's/FT_New_Face/XftFontOpen/g' \
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+ -e 's:xft freetype2:xft freetype2 fontconfig:' \
+ -i configure.in || die
+ rm configure || die
+
+ tc-export CC
+
+ sed \
+ -e '/chmod/s:555:755:g' \
+ -i Makefile.in || die
+
+ sed \
+ -e 's:-O[2s]\?::g' \
+ -i tcl.m4 || die
+
+ mv configure.{in,ac} || die
+
+ eautoconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ if tc-is-cross-compiler ; then
+ export ac_cv_func_strtod=yes
+ export tcl_cv_strtod_buggy=1
+ fi
+
+ local mylibdir=$(get_libdir)
+
+ econf \
+ --with-tcl="${EPREFIX}/usr/${mylibdir}" \
+ $(use_enable threads) \
+ $(use_enable aqua) \
+ $(use_enable truetype xft) \
+ $(use_enable xscreensaver xss) \
+ $(use_enable debug symbols)
+}
+
+multilib_src_test() {
+ virtx emake test
+}
+
+multilib_src_install() {
+ #short version number
+ local v1=$(ver_cut 1-2)
+ local mylibdir=$(get_libdir)
+
+ S= default
+
+ # normalize $S path, bug #280766 (pkgcore)
+ local nS="$(cd "${S}"; pwd)"
+
+ # fix the tkConfig.sh to eliminate refs to the build directory
+ # and drop unnecessary -L inclusion to default system libdir
+
+ sed \
+ -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
+ -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+ -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
+ -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
+ -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ sed \
+ -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+ -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+ fi
+
+ # install private headers
+ insinto /usr/${mylibdir}/tk${v1}/include/unix
+ doins "${S}"/*.h
+ insinto /usr/${mylibdir}/tk${v1}/include/generic
+ doins "${SPARENT}"/generic/*.h
+ rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+ # install symlink for libraries
+ dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+ dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+ if multilib_is_native_abi; then
+ dosym wish${v1} /usr/bin/wish
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+ fi
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 23ba2a760aad..6d2b4561dad2 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,13 +1,9 @@
DIST vala-0.32.1.tar.xz 2759528 BLAKE2B cce23844ee5769216ef5cccb20476f4bdd2cb809a226236dd8a6bd533bb8ceb5b87add1d4d1c9eec60e0a94e64cafafcd1f46b2b2ae12fc951515fe8571e2195 SHA512 d59db1bd9132f93f187c30ccabff9d21fe8685293a6494e5b009d883de4f844cc4b8dc5d3b6eb4e026a93490f2e4ff7ba83ff22a093c6f8f85e68d83f5fe1bb0
DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec
DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
-DIST vala-0.36.13.tar.xz 2869616 BLAKE2B adb22fa45e34c2be2accde2bc928148d3115dc0757338d66feb111b4225879f21f2af5f49511eff53697127d3431d22736be827d3663ed8a5de6d8ac718b0cee SHA512 7c9bb2e50f660ec28d55f755019ba81eb0358327967d8046a14691b5fe9c805f731c6277cbb732fc19af60322e2293bb25176387944ca2de709cde0c22b44d1f
-DIST vala-0.36.14.tar.xz 2874504 BLAKE2B 217178c9018e8d6623e5997f36210ecccfa0176ae06a52bed6b54b5d6af3504c7157b9bfb162d44ef96e0b95fa2ebfff4171b935f911491f62f88c69f6087d57 SHA512 123c54a3ba2198b6cc7d40bfce20dee687a369e26346fb6675ce07692755ceb91bea7137f707b9f5a7972c99b12a77e9d4cc65ae055053f48909c80377661fbe
DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
EBUILD vala-0.32.1.ebuild 779 BLAKE2B a8eaaeb0010f6d8e69b1c6554e45243a26f28d73be18e33b8e6ec3594863e888b3aa147618fc2cb6bb6b2d83c507f2b5b78b5d3146e819e608a294164e9affb9 SHA512 abf548841218503fea503b57cf6424cf2178858aae82b6d85f79f04a826609149f5cc9c17ba1cd27276fab2764cf14b83401c6a41114ec603775876ef73e1cc0
EBUILD vala-0.34.16.ebuild 780 BLAKE2B c531790f0f07a15a169f27ed7fb76533368646beec9b6dc20f29bf05f0055d90e30ad5706b5f97956d3ea6be241bafa9932139286f2f22d12e1fb5d6df5624e1 SHA512 51edab676afcc162df78c5a1031c19e80129d9dc27b28b7e3da825d71c173755cf8bbc841c140ce52f7765bd9acad29d31096af8be7d3a09d2e9a835cd2cc285
EBUILD vala-0.34.9.ebuild 779 BLAKE2B c5afaae1aba3eca78c7cbb50a3c854e7ecabb3545f897d61038df5fccf69d1b7993a79a526926eaeec2a082445fd1eccebeeeb737ec2256431cfd66b6b479755 SHA512 d4ba98022a7077701ea670d411cc50d8c2470cf9d6444a2db4e7fd18a0fa83f9d45b9370899ea2ecdc6a371046fca714528ee9f34b95e60aff29819b981ea41f
-EBUILD vala-0.36.13.ebuild 863 BLAKE2B 5cb3b23680d753af86c276d793b5598647ed88fe1fbcf906de472174e33102c5436b5cdbe99cf967e7062bdc7c6aa34589a74d4b4d6405a261639d9be034653d SHA512 111b109dc32b5347fcccd8fdca7b09b0603ecbdfa47ac56c4e384c161aef6e91071f78fa3f80fb2ac71347a2fa456b2d750b240f5688c5563a4e0c3a24236c33
-EBUILD vala-0.36.14.ebuild 871 BLAKE2B c5bfd2a68071e30f53904f35582b0883c499afd8577c07309b3d42e2396943191657f63d14ff480e2a34eae0d0a5babc0add33f56b939d5fccb4f776eff8f4a4 SHA512 753f6b4887d55231438bfd89636624979d838248625cc0f83b4e878f31f6832f4da614deac99585af3dd26459e2e69654d4f0c6cd3179d0e8ecf6f1b43c45319
-EBUILD vala-0.36.15.ebuild 861 BLAKE2B af090db75442372fb5fd9fa40c6d4b54b56182b365373fe1c6bb9a5b5563e36ed1391011b6bc53e687f6bb53c72b1c662135b15f99b7565fb2255a1914c070d8 SHA512 89c13f4e0ee7f328fd2cee8ab390a3b2b4fd5966d7f6fb04a6ccf81b003cf29c9087b176506bf0ac7fe9fbd1c394b8d22fdd68150bef14f51aaa589adcf21e7a
+EBUILD vala-0.36.15.ebuild 859 BLAKE2B 5c8d865b6bcca1ea81fe946a15a6477c1249116e995d0f3cbbdd12115c10b9ccdd5577e44b37c0bff6c0e245ada068128d334451f616fecc8158e82afbcd3101 SHA512 8374dc4b879dc3eaa2153be5ae662cf687cda3190316d3b769368186cabf05f5f58dec155cb330daeff7dbfa65cdeb763e919c1ae58049a4285904b487ac90c0
MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.36.13.ebuild b/dev-lang/vala/vala-0.36.13.ebuild
deleted file mode 100644
index 52ac3bb853ee..000000000000
--- a/dev-lang/vala/vala-0.36.13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.36"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
- !${CATEGORY}/${PN}:0
- dev-libs/libxslt
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- test? (
- dev-libs/dbus-glib
- >=dev-libs/glib-2.26:2
- dev-libs/gobject-introspection )
-"
-
-src_configure() {
- # bug 483134
- export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
- # weasyprint enables generation of PDF from HTML
- gnome2_src_configure \
- --disable-unversioned \
- VALAC=: \
- WEASYPRINT=:
-}
diff --git a/dev-lang/vala/vala-0.36.14.ebuild b/dev-lang/vala/vala-0.36.14.ebuild
deleted file mode 100644
index 357b5f50d91f..000000000000
--- a/dev-lang/vala/vala-0.36.14.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
- !${CATEGORY}/${PN}:0
- dev-libs/libxslt
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- test? (
- dev-libs/dbus-glib
- >=dev-libs/glib-2.26:2
- dev-libs/gobject-introspection )
-"
-
-src_configure() {
- # bug 483134
- export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
- # weasyprint enables generation of PDF from HTML
- gnome2_src_configure \
- --disable-unversioned \
- VALAC=: \
- WEASYPRINT=:
-}
diff --git a/dev-lang/vala/vala-0.36.15.ebuild b/dev-lang/vala/vala-0.36.15.ebuild
index 60d47a29b97c..9351ae8793cd 100644
--- a/dev-lang/vala/vala-0.36.15.ebuild
+++ b/dev-lang/vala/vala-0.36.15.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0.36"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="test"
RDEPEND="