7 files changed, 23 insertions, 47 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ab34b6eb2c32..c2c517d6b449 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/gnucobol/Manifest b/dev-lang/gnucobol/Manifest
index 20ef8d104484..e84046cd4a1e 100644
--- a/dev-lang/gnucobol/Manifest
+++ b/dev-lang/gnucobol/Manifest
@@ -1,5 +1,4 @@
+AUX gnucobol-3.1.2-gentoo.patch 494 BLAKE2B c701946439e87fddcd7ea8a5247fbd4a4d24badb14579f257933f4116262f91edecae376248b2f87d6e7ce4006aa07424a6a2fbfbf808274c43adb8815e9acec SHA512 95916c5359c564bc300c0125198c4174b65f3ef62dd00f3ac3097b4f04cdbf0b3f99cdbf7869bb7a9a18e7b0ccb14fd47507c936ce7fad18236838e428079bf3
 DIST gnucobol-3.1.2.tar.xz 2198512 BLAKE2B ccf9252bc4d5e64e966cea483981da36155767a5879967be7226fbcd8f13d8b427558de3a25cc8638f9156882b6f368acbf3e84d5e2ee68bd5754a6a513ac7d6 SHA512 738149c9d3e01140e4036b041f4eaa6c7caf7848a87146a3dd9940a9f17006805fd3c6b169d346bf01a0c2e671655080978c0f3182a85389f8f8a373ca8c1435
-DIST open-cobol-1.1.tar.gz 1007791 BLAKE2B 9154590626d885a75043c2426c1fafb146e0f7213d05f353f6d01c0e6b8cd8073e12f454a19ae1d3c712606f1c15958f241a7c54f76c995d0ce396d1eba1a0b0 SHA512 eb06cec456425ba5f4a091ae4ac0bfd14f38549bc147c606a022804f602102df6dbf0d399614f0eda49d50dee17eef55087748853a8cc8bdd1248f94fd09110c
-EBUILD gnucobol-1.1.ebuild 930 BLAKE2B aaa284174e8c56a5747adc934305425854ff74f1f3abb7d27a343b5373b278d7e5bf48a03284dc431fcfe79567e8430d9e24efb0c82745ad91da53f2eda481b5 SHA512 e13dbf1d2ee43567bfa74d97fceb224004ac8acc9f06e123f94c4d1c4fbcedf1b8d5a67edbb86604f027c464578cc0ca91bf38b292a84c5f05e9079025b03ee7
-EBUILD gnucobol-3.1.2.ebuild 784 BLAKE2B 3d322e314523d5ae413e1c369bdbeaaae9ea921a277085be78c64ef1887aad6dca0c76b34102f1b0b3e3e18bd6e7f858c9485dd0aa932fe48cbf7d394fa178bf SHA512 092d48ea3fa2606e5126909ad4bf8d185b674500ee588e5d45122da321920a9fac972c093c9e684924bd513720aa5f799fa907cb22de8499f2023f9b36f28b30
+EBUILD gnucobol-3.1.2.ebuild 889 BLAKE2B 9b533d18a5c999b72a6560313365b7ceb40f634159ee80a7f3033b9d11aae317ade53462e903b671872393d03a9b8b52675f408ca4b0c3b9a2f899bb8937f7fa SHA512 f38ab2718cf39b3a875ebf345f31923e4cb74b8064cebed04d145fa756b27a58e99af2766cd81362360e65063120260c933d1091dc21e2664065206b56c23b76
 MISC metadata.xml 443 BLAKE2B a5db53a5177af3154eb6c21c12dcd6ddf3d76445143b743768661fe242d9d2aeac41a630e24432e1578d28e4817a02b4fc80b72c1c3719e7cb7499adda4c4245 SHA512 11e0327d7d55ce1c89252688a2a11dfd0e40355dd982f630fab3e2fd5ee6de3ad6264a03a4d409f4c602d28f8c71b39b5c16752815e984f0c140ccd7caa7bf61
diff --git a/dev-lang/gnucobol/files/gnucobol-3.1.2-gentoo.patch b/dev-lang/gnucobol/files/gnucobol-3.1.2-gentoo.patch
new file mode 100644
index 000000000000..64c33a2b1dee
--- /dev/null
+++ b/dev-lang/gnucobol/files/gnucobol-3.1.2-gentoo.patch
@@ -0,0 +1,10 @@
+--- a/extras/Makefile.am	2022-11-26 16:51:38.799201541 +0100
++++ b/extras/Makefile.am	2022-11-26 16:52:00.112873141 +0100
+@@ -30,6 +30,6 @@
+ 
+ SUFFIXES = .cob .$(COB_MODULE_EXT)
+ .cob.$(COB_MODULE_EXT):
+-	("$(top_builddir)/pre-inst-env" $(COBC) -m -Wall -O2 -o "$@" "$<" || \
++	("$(top_builddir)/pre-inst-env" $(COBC) -m -Wall -O2 -g -o "$@" "$<" || \
+ 	 "$(top_builddir)/pre-inst-env" $(COBC) -m -Wall     -o "$@" "$<" || \
+ 	 "$(top_builddir)/pre-inst-env" $(COBC) -m -Wall -vv -o "$@" "$<")
diff --git a/dev-lang/gnucobol/gnucobol-1.1.ebuild b/dev-lang/gnucobol/gnucobol-1.1.ebuild
deleted file mode 100644
index fa480cae9180..000000000000
--- a/dev-lang/gnucobol/gnucobol-1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="open-cobol"
-MYP=${MY_PN}-${PV}
-# Future proof pkg if maintainer or p-m want to bump to latest GNUCobol
-
-DESCRIPTION="an open-source COBOL compiler"
-HOMEPAGE="https://sourceforge.net/projects/open-cobol/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MYP}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-# License must be changed to GPL-3+ if/when pkgmove is done
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="berkdb nls readline"
-
-RDEPEND="dev-libs/gmp:0=
-	berkdb? ( sys-libs/db:4.8= )
-	sys-libs/ncurses
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-S="${WORKDIR}"/${MYP}
-
-src_configure() {
-	econf \
-		$(use_with berkdb db) \
-		$(use_enable nls) \
-		$(use_with readline) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-lang/gnucobol/gnucobol-3.1.2.ebuild b/dev-lang/gnucobol/gnucobol-3.1.2.ebuild
index 8202373ea8e8..b6419a90cf82 100644
--- a/dev-lang/gnucobol/gnucobol-3.1.2.ebuild
+++ b/dev-lang/gnucobol/gnucobol-3.1.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="A free/libre COBOL compiler"
 HOMEPAGE="https://gnucobol.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
@@ -24,6 +26,13 @@ BDEPEND="sys-devel/libtool"
 
 DOCS=( AUTHORS ChangeLog NEWS README README.md )
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_with berkdb db) \
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 8746b6c1d4c3..210894cd3ba5 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -22,7 +22,7 @@ DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd
 DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533 SHA512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
 DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
 EBUILD ruby-2.7.6.ebuild 7913 BLAKE2B 8330eaa1563f2880730eee59532de22372aad9bc8c7ea94ee489869100875890316306ee5edc268acc105be2a54b2fdb0a456364290e69bd5b046acfbb189012 SHA512 224412dcc37ec8368907190e14ac3dfe16f5636b442d92f029b55a1cfdffa036828c279e8da9af61ccbd3c218e138068e35e3cc2d2614424c15395281a2cad9a
-EBUILD ruby-2.7.7.ebuild 7927 BLAKE2B 50adcd38077c99ff8c912fce61942d3aa959c3d158bd14acfa0adaa40072e1e5e594fff9ad2f878ea66922bd76b56d161cf316b47c94c8aa03840a5edb60c45a SHA512 37797405276eee024dafeec170d46e9608fd13203d18f3e51615f3b66903112d44a5cfd4338d7a5a7cf04c567f8227c35b179bdcd9fb40a8fc215c6a444f4b9d
+EBUILD ruby-2.7.7.ebuild 7921 BLAKE2B 165eb81e6c360c478d364566e2a2c95b162aae7181fc1a34f73bfbb139609003c5af6465bb6b9ebd2d3ab91cfb9c3c47aee8088167500e1be6891c45eacee573 SHA512 ea5d07e0e6243ac6e5daba45f4f00106a2dbefdb79c2b1231e60a63a542172d016ee717052bd16cac11f023539686143e7dc3fb62cb53d2eb3664e4ba97005de
 EBUILD ruby-3.0.4.ebuild 7768 BLAKE2B b20ea1f1c0cbc583a41587f7c32e83def9a50045cc6bf6607a0ef6f90b6712d0bc242abb5ad15a152b3b6b037d3038c38006e34b4b6d777959ec84250ccae6fa SHA512 9ae32072ad97f3fe39a98bcd6ec249a6d1be97e8104b8482dd3d56c53b945c154cac4b67012938fb9b87352e984c510cd48c9e0ed602577c90881b3fb845ec2f
 EBUILD ruby-3.0.5.ebuild 7774 BLAKE2B 7ccf3d999e50ee855c60969763c057dbe9354b090fe9928dddd322b6189f526b2e94504f9fd6b0f352f3dca039fd74fec3770f1777ce7f7ae9ec0e41e798907d SHA512 b10709b08711b5f3292813f60d0fca56fbf1d66e1893312e77812759ee056ec8fe5883d94d57b103947d518e0ec392e02bddb8370cf6508366f8293715a2ef62
 EBUILD ruby-3.1.2-r1.ebuild 7386 BLAKE2B a9d1ddefbfb87658518a66a49cbd69b3f17907c65997468489356510733f51a8e02b560303e0581dcfdecd6ccf0c2b4ac57c21b4b69505d151bc15c9f1d508ee SHA512 ada276970c6f78ccb8085f8c2b898bc38170b62efb32f3fa024b8852f60bd3f723c4d3c9c0b6cd1b6877486f91372a6880c38ee01aea2cf3bafdc0abe85d6553
diff --git a/dev-lang/ruby/ruby-2.7.7.ebuild b/dev-lang/ruby/ruby-2.7.7.ebuild
index af14585afcc4..d3f3a3c6699d 100644
--- a/dev-lang/ruby/ruby-2.7.7.ebuild
+++ b/dev-lang/ruby/ruby-2.7.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="