diff options
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/Manifest.gz | bin | 21695 -> 21697 bytes | |||
-rw-r--r-- | dev-lang/nprolog/Manifest | 6 | ||||
-rw-r--r-- | dev-lang/nprolog/nprolog-3.10.ebuild | 39 | ||||
-rw-r--r-- | dev-lang/nprolog/nprolog-3.30.ebuild (renamed from dev-lang/nprolog/nprolog-2.50.ebuild) | 0 | ||||
-rw-r--r-- | dev-lang/ruby/Manifest | 8 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-3.1.6-r1.ebuild | 26 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-3.2.5.ebuild | 26 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-3.3.4-r1.ebuild | 26 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-3.3.5.ebuild | 26 |
9 files changed, 22 insertions, 135 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex 63ba73251010..38c01cd472f8 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest index af30830878da..b71e72e2220a 100644 --- a/dev-lang/nprolog/Manifest +++ b/dev-lang/nprolog/Manifest @@ -1,9 +1,7 @@ DIST nprolog-1.94.tar.gz 128172 BLAKE2B b3a2de8e5e247bce55fc6eabbd06dddee1d42d8d993b38a2effb505647e5a4a60f89f85f14be4e469d81b5488b4494e0a45c2672b2ba00b8f06ae0545951d08e SHA512 7db39847ecfa91b65fad1e035ddb9267856726adc9741a76fdd088c8f678ba8e98eef3890283b543d345a9441dabada4038984e12709898c6887a186a19136c9 -DIST nprolog-2.50.tar.gz 229903 BLAKE2B 1ddc782ddb8e5dff49c4abeb75b34607ff4ed766b98aebf7dba4a799f353649ac942c504363d7dec17c03fc17d01d45b33efcf6f8a76158d5366e30b7647462d SHA512 f37accf8fb156a306ff2aefd11e655fbbdd4e7f02030a9762e25676cc6e88eaa31f7600f421d7ea982e7f0dd47519b0475f4c93dfcb67f1b1d41211d31107163 -DIST nprolog-3.10.tar.gz 582817 BLAKE2B c32ded1a80dd3a32b587685a9e803c1e785433b655cdd6cdba66a0e933376cd354be06b8b7fa2fd626839ee9ed07b0a8464c7ee3bf582a6e9a91130d71b1d56f SHA512 ab5afc6fb8ed861e2dcab9cd3d9e3f9d9d5be8c443855b2090cf1b2233c6d6edbbe56e7f895d0665e57b4d021895a17ff7839f30b318c89e9ac4c527af2fb7ac DIST nprolog-3.22.tar.gz 586822 BLAKE2B ac2e3e468de38c9d503c4670fd6aa5c61b93cca3f44fbd8f3668cd070563615d3567e009141f52577352a231d8f8d2713f2fc85979ff7ebd383817e8bbd0a610 SHA512 5f80d4fc9d08172d8555c57c4dd466037b0c878ff13c20b413f45859a614c1fed8ed3e4c75f68a2b9309fd09601d1ca56fb66a3f2a14d6378d194e85f8873cad +DIST nprolog-3.30.tar.gz 593861 BLAKE2B 878082729facd8dc74e1d0c8c9c7158b40446172f449915c1799fe1061c9d812fad61fe89d9f6da4e5a51f0dd8e9fed571e8b36f3342b7906de79be34697bee4 SHA512 7837a43328b5285f8184147f93add1135331ae768ceccf6259ce9d694f6bf0f0fea9ca004ec6f7c6d3c43d3c58be61eb016dbb5834fa3fd685ebb3c600c6342d EBUILD nprolog-1.94.ebuild 634 BLAKE2B 822935947e92f30d24d24df388dc6510d81d110a797308305a95192caf1ce0204228e392d5044b553dc1662df5ac263d59b06e06bc3d85d0111524feb29341be SHA512 7cf886165103e200e8acb05903df2cde5457bf0daaebe83c7098edc003cafa21ff285eff13bfd24eac6ffd142c334c5ef0abe18fe14e58752f1bfeb5bf9f760d -EBUILD nprolog-2.50.ebuild 759 BLAKE2B 2a72cd232d59ce5c383da62fded42d6bc477f167398ea54172b7c0d009cf5d3614180fb635f3c6b47e2da6c1443695f4278ce4e7d1e8edcb9aa4a974069153c3 SHA512 5a276f72d1b8e47ef2e3152a077ed5225f48a222a4ba621dd59951941aeb69686b570e43904357bd7b1730fea9f55178e164af17f4ebd9213ae9df1aa40a7137 -EBUILD nprolog-3.10.ebuild 759 BLAKE2B 2a72cd232d59ce5c383da62fded42d6bc477f167398ea54172b7c0d009cf5d3614180fb635f3c6b47e2da6c1443695f4278ce4e7d1e8edcb9aa4a974069153c3 SHA512 5a276f72d1b8e47ef2e3152a077ed5225f48a222a4ba621dd59951941aeb69686b570e43904357bd7b1730fea9f55178e164af17f4ebd9213ae9df1aa40a7137 EBUILD nprolog-3.22.ebuild 759 BLAKE2B 2a72cd232d59ce5c383da62fded42d6bc477f167398ea54172b7c0d009cf5d3614180fb635f3c6b47e2da6c1443695f4278ce4e7d1e8edcb9aa4a974069153c3 SHA512 5a276f72d1b8e47ef2e3152a077ed5225f48a222a4ba621dd59951941aeb69686b570e43904357bd7b1730fea9f55178e164af17f4ebd9213ae9df1aa40a7137 +EBUILD nprolog-3.30.ebuild 759 BLAKE2B 2a72cd232d59ce5c383da62fded42d6bc477f167398ea54172b7c0d009cf5d3614180fb635f3c6b47e2da6c1443695f4278ce4e7d1e8edcb9aa4a974069153c3 SHA512 5a276f72d1b8e47ef2e3152a077ed5225f48a222a4ba621dd59951941aeb69686b570e43904357bd7b1730fea9f55178e164af17f4ebd9213ae9df1aa40a7137 MISC metadata.xml 657 BLAKE2B 9331358542d57958385bc1218b4a1c5d38185ab0822d0cc68e51bcc5f8b00645a523a1a4f60d30188efc3ed7cb934f0a6a964d27bf0915c5956c69774c734590 SHA512 972ae4d1f2179887f77d8805f2e5482c17767e38b078fa9d9ee65a2f43e0b56b76fccd0166f4c5121de9a7cead4faa7683bd8e9076c257ffb2d1deb673eb276e diff --git a/dev-lang/nprolog/nprolog-3.10.ebuild b/dev-lang/nprolog/nprolog-3.10.ebuild deleted file mode 100644 index 40d3b000da40..000000000000 --- a/dev-lang/nprolog/nprolog-3.10.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Interpreter and compiler to be compatible with Arity/Prolog32" -HOMEPAGE="https://github.com/sasagawa888/nprolog/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git" -else - SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD-2" -SLOT="0" - -DOCS=( README{,-ja}.md document ) - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - exeinto /usr/bin - doexe npl - - insinto "/usr/share/${PN}" - doins -r example library - - einstalldocs -} diff --git a/dev-lang/nprolog/nprolog-2.50.ebuild b/dev-lang/nprolog/nprolog-3.30.ebuild index 40d3b000da40..40d3b000da40 100644 --- a/dev-lang/nprolog/nprolog-2.50.ebuild +++ b/dev-lang/nprolog/nprolog-3.30.ebuild diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 6ac4b965e28b..fd8d1ce70fd4 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -29,13 +29,13 @@ DIST ruby-3.3.4.tar.xz 16366580 BLAKE2B e10b81ad7838e3d443ce0b12b8372faebb001f00 DIST ruby-3.3.5.tar.xz 16403660 BLAKE2B 4fa242ceeaf0dbf0d048b3f116f149f299c1a0ccca500a47929344da523cd3c49365381777e56546fe94003ee90ccc1f2cc957697eb82cd8beb7311b0b00287c SHA512 dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883 EBUILD ruby-3.1.4-r3.ebuild 8517 BLAKE2B 8a89694e604a5c61c51154246598a4f57465c6f4443ae0c103e8ee6825a6f7ad2709a6bfd3e12fc141321a5fbc7fd549ffeca7d75d4db79d564483494285f9b3 SHA512 0a422dfee5abcce9fd9c27009370c92c9ca58eeb129a2e2384eb6747f83a6e7418e0de58d562c175fea52ab7519bc2105ae64925e845fda169482b3be26cf211 EBUILD ruby-3.1.5.ebuild 8842 BLAKE2B 322f5da3ded0e48fbb70d222d0df8a64c6c91e1445e710ddddfbb24afcbd2f4ba6ce563da93c89477efd4f940d82a182ec5e9617132c446155fda021a71ac70c SHA512 1e182e9b425f2c92fb915c89e10e745c2c06ee010dd5f4477a21a42909ac4672e8fb2600323e5c781f564f4d7377ecd997d83860a0b59294d3bc6c184291bcc1 -EBUILD ruby-3.1.6-r1.ebuild 9380 BLAKE2B 6a0ea95ce543bb3d8e914da68f0007afc7c621921068ab712c83927fd602ab05b3dd0d01f72e016740e0768487704d3c0a5c35f2296e25a8370326544a242ac5 SHA512 573b8253f771751653cbb5c3be3d6f0e782cd517290a7dd59a412394936fb86615bbe2416acff4bf10b3e753c91fa4f29b8d9369fc1717ff67eed076fa290282 +EBUILD ruby-3.1.6-r1.ebuild 8913 BLAKE2B e3efb05d75ac99b2f4b7b15a987e799ea949bf372eb9893d285868e3e616807479faeaf236fa7c874bbc93d2dda002ef061d97ff46ff7652158dfb3f90ee82dd SHA512 ab9f147269222231d65c92469573a1261a4ebe68a994b38c4eced06e5cb204d991a345986c31440198a96adef24e05ca905839bd218e66053c93e94bbe36fe95 EBUILD ruby-3.2.3.ebuild 9698 BLAKE2B 63efabd9597ac2faecbe392483a2ec3d68bc3407c8d16955cd0f12fd8db0674e6f04b52fbd564a9175bd921efdf9b91e59a881777aea2d51a74dd17cdd610585 SHA512 d282987e2f1c562c23af68930adb47ea82386948838a83629149c3739f0a0401a1910ac654def3b28d7d91d7801605a8f69d785e8364cdae9f21ac32b9c63196 EBUILD ruby-3.2.4-r1.ebuild 9892 BLAKE2B 696d341ade6acdd7bd06976cab37c3d1d80baf529ef8f2391ae1bb9ba1425177d3aed10378dbb1a450a391b6682a3b5756ddfc51d852947253d1475995f24388 SHA512 0563553a5d2a15e2d3eebbe466f50e59840cfa60431840208340bdc0f03c9b239ba4e20e2bb690b176d1ff7475834ceb7c913a7e010ebe6105b5d5630aaa2039 EBUILD ruby-3.2.4.ebuild 9742 BLAKE2B 174541eaf3f3d584a0ab60788bdff59b2aac6d20d26ee5cc4079a6e4c5dd5860ff05bc4d94d86fc9a669aaa88cc4e0fea70e3b0fd4a25881e2e5039f355224cc SHA512 00210ee3cd7b54cfd8122b77bccc7c6dde0c42fe07246e26918f5c343a8ebf893c375f08ca90042774c63121c20d1b3cb1de795f6956a29aa0e6691cd0326cef -EBUILD ruby-3.2.5.ebuild 9894 BLAKE2B 257231d0a90e67390825845d1ee7857f2aae4f4e864f422503fa79bfe67e3713d0826cb18642ef252dc73f33359ca99a47b9c438fba6e23c14cf8cbc02491438 SHA512 0d97f49b2183e2b6eab96fad35ff3a92361f198b0d76ccf91bfd79e882a1865407dd1c2feea08cc6df9c25469c8210c2519d4fda34c5731343cb3886ba76c41d +EBUILD ruby-3.2.5.ebuild 9427 BLAKE2B 68424faef3d2945d557bf74d17e54d2bc10d6e854b613e25d53dc5e1ab7699a120942e8fe65806e8952886d71df20a3b2c3c2cc3d1b0b5051236619a2f11ca5e SHA512 6cb04c9fc32b4fe44a300f51d854d51805a41cc49eb0294b287cc0e50be156a12939352a3d5ce77fb00843f456870545c791c064c6dea0d3c7721ca65008482a EBUILD ruby-3.3.2.ebuild 9433 BLAKE2B 4e3f6bf6c7be98a7f5f8b65ec74378001ddc3802a0ab700539a85ac7d687b755728b66623513aa1a0a0a51daf4d4072bb1f6e0122cdb10c4898e15194340a25f SHA512 f621f16dab0d1982ff20f6a312c1113ea73179b3f3e1d0cc2c1da76a62bbd28caa5a5b7622705ccf1fe45551b84749878a6839309a7be2d94a522ec6a57fac73 -EBUILD ruby-3.3.4-r1.ebuild 9747 BLAKE2B d4bf7c718aabb9275335dc9fadc04ca38ddfad72e3586cd56d59fa63d1eda7205452443a01224c6a3ea2e5fec872330c0778181c919ca2e22344414cf7cf3c39 SHA512 6ebaf41b4046012448ec8c0026ff7c6140738dd71218aed0978355541afa6485608ca91e4b33b431b473b4397c62fd829b610df5292fb588241b18f3310fea55 +EBUILD ruby-3.3.4-r1.ebuild 9280 BLAKE2B d97425d417d9a5b6b3af2a1da9fc55b80d8830eb7dc28365cc1c815d6bb2339ab92b9b427f993b2934758081f743d2754defd03284c36e4e1003edfe22f6bbd2 SHA512 6e8d50eaa87948d36f08f34bf65c92b8f7ff31fe8458aa17181725785a7eed2c98cb52346e6256a060124c99b8f39cd889298b94875b8feacefa0e2931914388 EBUILD ruby-3.3.4.ebuild 9704 BLAKE2B 73d65295cfde3283d34957db55fc2792c98e3504ec67c9e67ca85f1baf95070a0e46c498c273cfbca82bb7dea4e0c842ffb4a878edc56dcadb4a1bbacd8f7fb9 SHA512 b6006b606f77c7d524ae66b15fe46d186d79e1c15175359ed0e672ce725589e39bd3c24687d282249200cfe4a1d1677c931a02bd346a742ddca475eb393599d9 -EBUILD ruby-3.3.5.ebuild 9747 BLAKE2B d4bf7c718aabb9275335dc9fadc04ca38ddfad72e3586cd56d59fa63d1eda7205452443a01224c6a3ea2e5fec872330c0778181c919ca2e22344414cf7cf3c39 SHA512 6ebaf41b4046012448ec8c0026ff7c6140738dd71218aed0978355541afa6485608ca91e4b33b431b473b4397c62fd829b610df5292fb588241b18f3310fea55 +EBUILD ruby-3.3.5.ebuild 9280 BLAKE2B d97425d417d9a5b6b3af2a1da9fc55b80d8830eb7dc28365cc1c815d6bb2339ab92b9b427f993b2934758081f743d2754defd03284c36e4e1003edfe22f6bbd2 SHA512 6e8d50eaa87948d36f08f34bf65c92b8f7ff31fe8458aa17181725785a7eed2c98cb52346e6256a060124c99b8f39cd889298b94875b8feacefa0e2931914388 MISC metadata.xml 504 BLAKE2B 49be2bb1dba034b23a8294cca0e5419099b487973a43db31c0edc4b9a2a08eb1b54437b0c7e6a9e6d8a5c0145cd73464f830ec04ca62540416c32b2d094cdd63 SHA512 e9991c588874e36f6a0abb12125bcd3f2b1e787df62d9f7089053959286b56676a9f35c7e82116274f169bfa22359be8df59fca6454be559e7669d2e78dc4c22 diff --git a/dev-lang/ruby/ruby-3.1.6-r1.ebuild b/dev-lang/ruby/ruby-3.1.6-r1.ebuild index 9d129e2534a8..39d96ae94853 100644 --- a/dev-lang/ruby/ruby-3.1.6-r1.ebuild +++ b/dev-lang/ruby/ruby-3.1.6-r1.ebuild @@ -113,23 +113,6 @@ src_prepare() { if use prefix ; then # Fix hardcoded SHELL var in mkmf library sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die - - if [[ ${CHOST} == *darwin* ]] ; then - # avoid symlink loop on Darwin (?!) - sed -i \ - -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ - configure.ac || die - - # make ar/libtool hack for Darwin work - sed -i \ - -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ - configure.ac || die - - # disable using security framework (GCC barfs on those headers) - sed -i \ - -e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \ - random.c || die - fi fi eapply_user @@ -197,7 +180,10 @@ src_configure() { # Provide an empty LIBPATHENV because we disable rpath but we do not # need LD_LIBRARY_PATH by default since that breaks USE=multitarget # #564272 - INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ + # except on Darwin, where we really need LIBPATHENV to set the right + # DYLD_ stuff during the invocation of miniruby for it to work + [[ ${CHOST} == *-darwin* ]] || export LIBPATHENV="" + INSTALL="${EPREFIX}/usr/bin/install -c" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ --with-readline-dir="${EPREFIX}"/usr \ @@ -250,10 +236,6 @@ src_install() { local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - if [[ ${CHOST} == *darwin* ]] ; then - local -x DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" - fi - local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" for d in $(find "${S}/ext" -type d) ; do RUBYLIB="${RUBYLIB}:$d" diff --git a/dev-lang/ruby/ruby-3.2.5.ebuild b/dev-lang/ruby/ruby-3.2.5.ebuild index 213e5f3d18a4..2c3a3f8c63c1 100644 --- a/dev-lang/ruby/ruby-3.2.5.ebuild +++ b/dev-lang/ruby/ruby-3.2.5.ebuild @@ -119,23 +119,6 @@ src_prepare() { if use prefix ; then # Fix hardcoded SHELL var in mkmf library sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die - - if [[ ${CHOST} == *darwin* ]] ; then - # avoid symlink loop on Darwin (?!) - sed -i \ - -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ - configure.ac || die - - # make ar/libtool hack for Darwin work - sed -i \ - -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ - configure.ac || die - - # disable using security framework (GCC barfs on those headers) - sed -i \ - -e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \ - random.c || die - fi fi eapply_user @@ -203,7 +186,10 @@ src_configure() { # Provide an empty LIBPATHENV because we disable rpath but we do not # need LD_LIBRARY_PATH by default since that breaks USE=multitarget # #564272 - INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ + # except on Darwin, where we really need LIBPATHENV to set the right + # DYLD_ stuff during the invocation of miniruby for it to work + [[ ${CHOST} == *-darwin* ]] || export LIBPATHENV="" + INSTALL="${EPREFIX}/usr/bin/install -c" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ --with-readline-dir="${EPREFIX}"/usr \ @@ -257,10 +243,6 @@ src_install() { local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - if [[ ${CHOST} == *darwin* ]] ; then - local -x DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" - fi - local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" for d in $(find "${S}/ext" -type d) ; do RUBYLIB="${RUBYLIB}:$d" diff --git a/dev-lang/ruby/ruby-3.3.4-r1.ebuild b/dev-lang/ruby/ruby-3.3.4-r1.ebuild index 8cf5cb51be15..cac3085b6240 100644 --- a/dev-lang/ruby/ruby-3.3.4-r1.ebuild +++ b/dev-lang/ruby/ruby-3.3.4-r1.ebuild @@ -122,23 +122,6 @@ src_prepare() { if use prefix ; then # Fix hardcoded SHELL var in mkmf library sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die - - if [[ ${CHOST} == *darwin* ]] ; then - # avoid symlink loop on Darwin (?!) - sed -i \ - -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ - configure.ac || die - - # make ar/libtool hack for Darwin work - sed -i \ - -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ - configure.ac || die - - # disable using security framework (GCC barfs on those headers) - sed -i \ - -e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \ - random.c || die - fi fi eapply_user @@ -206,7 +189,10 @@ src_configure() { # Provide an empty LIBPATHENV because we disable rpath but we do not # need LD_LIBRARY_PATH by default since that breaks USE=multitarget # #564272 - INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ + # except on Darwin, where we really need LIBPATHENV to set the right + # DYLD_ stuff during the invocation of miniruby for it to work + [[ ${CHOST} == *-darwin* ]] || export LIBPATHENV="" + INSTALL="${EPREFIX}/usr/bin/install -c" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ --enable-shared \ @@ -258,10 +244,6 @@ src_install() { local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - if [[ ${CHOST} == *darwin* ]] ; then - local -x DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" - fi - local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" for d in $(find "${S}/ext" -type d) ; do RUBYLIB="${RUBYLIB}:$d" diff --git a/dev-lang/ruby/ruby-3.3.5.ebuild b/dev-lang/ruby/ruby-3.3.5.ebuild index 8cf5cb51be15..cac3085b6240 100644 --- a/dev-lang/ruby/ruby-3.3.5.ebuild +++ b/dev-lang/ruby/ruby-3.3.5.ebuild @@ -122,23 +122,6 @@ src_prepare() { if use prefix ; then # Fix hardcoded SHELL var in mkmf library sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die - - if [[ ${CHOST} == *darwin* ]] ; then - # avoid symlink loop on Darwin (?!) - sed -i \ - -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \ - configure.ac || die - - # make ar/libtool hack for Darwin work - sed -i \ - -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \ - configure.ac || die - - # disable using security framework (GCC barfs on those headers) - sed -i \ - -e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \ - random.c || die - fi fi eapply_user @@ -206,7 +189,10 @@ src_configure() { # Provide an empty LIBPATHENV because we disable rpath but we do not # need LD_LIBRARY_PATH by default since that breaks USE=multitarget # #564272 - INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ + # except on Darwin, where we really need LIBPATHENV to set the right + # DYLD_ stuff during the invocation of miniruby for it to work + [[ ${CHOST} == *-darwin* ]] || export LIBPATHENV="" + INSTALL="${EPREFIX}/usr/bin/install -c" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ --enable-shared \ @@ -258,10 +244,6 @@ src_install() { local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - if [[ ${CHOST} == *darwin* ]] ; then - local -x DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" - fi - local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" for d in $(find "${S}/ext" -type d) ; do RUBYLIB="${RUBYLIB}:$d" |