6 files changed, 17 insertions, 110 deletions
diff --git a/dev-lang/c-intercal/Manifest b/dev-lang/c-intercal/Manifest
index 7f0281ebbb3f..ba50d927228e 100644
--- a/dev-lang/c-intercal/Manifest
+++ b/dev-lang/c-intercal/Manifest
@@ -1,9 +1,6 @@
 AUX 50c-intercal-gentoo.el 191 BLAKE2B 3575c7ecac45d7023f727e559bbcfeb311c45c720a54c23661ec13a71272b748dbe499d500f0e8bd4aff3d871c96eafbf2f80e4d7bb2c402ffe3b628d2243398 SHA512 957e43fb8ada732ae9224313456d750df25484b8bc8d0d3b1ffcd547542de99ffcffdc8dabbebda0fbaa0a760e799b403a6e1a5160e5359e15072a72e9c19ab2
-AUX c-intercal-30.0-version.patch 279 BLAKE2B 12f448dc7dbc5ede3f6537564f0477b2166e3e456bb750cf75813f30fecf74bd446f04b28def7556d16630f02d5e15e2289f0c39deb07915d39f77ab0856ffe8 SHA512 ba38939f207587ae7b99a2dab63e395c27a01ee6e8495c8b10eee3c9d48ee9848cc2e240cb123abd93e69d1f516cf779f41f5b888ee194641df50001ac446a60
-AUX c-intercal-30.0-yywrap.patch 282 BLAKE2B 0417757240a476c845398db4e2644c5333d851e1107ceb09f3b8f4a7c3d4ade553331ea36663906ecf11dc739d47b66ae1b70f5d32bae34cd42584d68db8552c SHA512 b181da7c93268ece0db9244ed7bc0d085d12dfeb92e6f4b6af9b8fe17fed8e5ef432006bb097fc568a401e74540c97a3afa738510f76f78052332c573ae1999c
+AUX c-intercal-31.0-no-common.patch 311 BLAKE2B 25e260a1e4c7079fb8baac690580505c401870fe60b6c0e398f79a8d1027ea6395b30b8c16244ad147489787606d6b6a27f244e4b8f9e9f7710405b124d3d7a8 SHA512 84db59e1855672260079c39ac066d98d031536019180483002b224c48912472c175bcde20053d37510e6aa07fa2de62beb4161d5a262b5d775742d0d10e7b51e
 AUX c-intercal-31.0-version.patch 330 BLAKE2B f7a18b5098c6969ea29c21513221e3dd6f6cce847ceca102f8d3a0713d18bbdfd11b1349b0463f7338ef69ccb2b08aa8162e91860b26338c577647728e1261db SHA512 cfb0c79e76b19938fda232cf508e32812aa4edad2eb6545eef84f6bdfd8304666911ca4042450c4642699a41a140f4e199acf0f8d9ab0f24ab8daa81a89d3393
-DIST intercal-0.30.tar.gz 930759 BLAKE2B c8c9b77c31901da8f7dbd5a76c2d6fa900962c69f4ca56835f750f40370d5161f6311cbe5473cdb7342772c1cc5317e51d91e174cb16985565adacd001fc1f29 SHA512 e82f52082a73e0eb6116026f78fdcc38369f54af828b9ed0d3ca6ed6c40550bfa81db4ca7c4d09015b5db5104a1c06229cfed52e1d202c3a7443f933fbcc0498
 DIST intercal-0.31.tar.gz 940950 BLAKE2B 9a23229b1d7f0524b164a4b66bcab4fdf67a04ba1e411365a46a90d646867fe92d6e328935b406673809535a895becde934fb6cf2e8380943eb8f19473fcedab SHA512 ca5c10be880ce2470d7dd3404fa5a314bd7bcab45cf4908f7108eb1baa50339b876e135251d991527881b564027c63dc38d74a154cbd00d606261013d2b01262
-EBUILD c-intercal-30.0.ebuild 1679 BLAKE2B 958eb5d642f9ec4d3dd86f7d92dd5b05d57c0704d2dcb790b9092ca309c27daab6d03e55b79f8456bcac1ac9d4efd007d1c66b906db7d1bdb89d6fbec5479139 SHA512 d2e53e0de70ecca549e65a4dd0862228fb904fc5fcb404dfc76a28f65b2e2f2d6bdc486384f871d178e9036f2af75102b687de03b4eef93f7744ace7a9f6d4fa
-EBUILD c-intercal-31.0.ebuild 1656 BLAKE2B f6a26583c91c48bce21462e54f09528d24eaa3a2ecb85d838df01a7b6cf51a92b323614c3df3d8ad3fab2c50159e388afdee2dc74cddd1b31b6307634c5cc8ac SHA512 feb90dfd415884128597c484b5a3bfb44d511c709452e24e3969908eebc94af0fa7b960f27028e1faae2f8e5fdf336b77097f5015a0d132c596cceadbf80f726
+EBUILD c-intercal-31.0.ebuild 1699 BLAKE2B 829df21397fe5227645f1a3f0bfcd94b18dd7f534e495477d9b6d85711866276f8b22b3ad918875e6bfead1c0a513c1bb5034e3670542d76f45969a306355254 SHA512 16c6b70a7cee43f7f631d7edc24a13df90afa0105b05bdd9bd18cfa97e25929ff1696ab97e1752aa634dcedaae57d383483afe306a8e137cc2c79bab2affdf2f
 MISC metadata.xml 592 BLAKE2B 8d07802ff5f3cbedb9643b61c469214284c5d21dbaf7aa2afa1c706cf0c9ebe0af2903f3bada0145fd0fe648fe46678919a730f88a2c38c84d149416a8095b11 SHA512 d2b9dad8dd7a03744904ccee87ba17ed726b0005b6bd685d7b926b4657e57c9456d8a7f57deedf260efd543b42c157c13876cf6942cd1f47fee88f0782dac13d
diff --git a/dev-lang/c-intercal/c-intercal-30.0.ebuild b/dev-lang/c-intercal/c-intercal-30.0.ebuild
deleted file mode 100644
index dc79132dad03..000000000000
--- a/dev-lang/c-intercal/c-intercal-30.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common
-
-# C-INTERCAL uses minor-major ordering of version components and
-# negative version numbers. We map version components -1, -2, ...
-# to 65535, 65534, ..., and subtract one from the next component.
-# For example, upstream version 0.28 is mapped to Gentoo version 28.0
-# and 0.-2.0.29 is mapped to 28.65535.65534.0.
-get_intercal_version() {
-	local i=.${1:-${PV}} j k c=0
-	while [[ ${i} ]]; do
-		(( k = ${i##*.} + c ))
-		(( (c = (k >= 32768)) && (k -= 65536) ))
-		i=${i%.*}
-		j=${j}.${k}
-	done
-	echo ${j#.}
-}
-
-MY_PN="${PN#c-}"
-MY_PV="$(get_intercal_version)"
-DESCRIPTION="C-INTERCAL - INTERCAL to binary (via C) compiler"
-HOMEPAGE="http://www.catb.org/~esr/intercal/"
-SRC_URI="http://www.catb.org/~esr/intercal/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs examples"
-
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-version.patch
-	eapply "${FILESDIR}"/${P}-yywrap.patch
-	eapply_user
-	eautoreconf
-}
-
-src_compile() {
-	emake
-
-	if use emacs; then
-		elisp-compile etc/intercal.el
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BUGS NEWS HISTORY README doc/THEORY.txt
-
-	if use emacs; then
-		elisp-install ${PN} etc/intercal.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	use examples && dodoc -r pit
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/c-intercal/c-intercal-31.0.ebuild b/dev-lang/c-intercal/c-intercal-31.0.ebuild
index fa55b57e11b6..5f04f53c129f 100644
--- a/dev-lang/c-intercal/c-intercal-31.0.ebuild
+++ b/dev-lang/c-intercal/c-intercal-31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,7 @@ SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-version.patch
+	eapply "${FILESDIR}"/${P}-no-common.patch
 	eapply_user
 	eautoreconf
 }
diff --git a/dev-lang/c-intercal/files/c-intercal-30.0-version.patch b/dev-lang/c-intercal/files/c-intercal-30.0-version.patch
deleted file mode 100644
index 3fe8d026e23a..000000000000
--- a/dev-lang/c-intercal/files/c-intercal-30.0-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- intercal-0.30-orig/configure.ac
-+++ intercal-0.30/configure.ac
-@@ -14,7 +14,7 @@
- 		  subdir-objects no-texinfo.tex -Wall -Wno-override])
- 
- dnl Information about this version of INTERCAL.
--PACKAGE_VERSION=0.29
-+PACKAGE_VERSION=0.30
- 
- dnl Checks for programs.
- AC_PROG_YACC
diff --git a/dev-lang/c-intercal/files/c-intercal-30.0-yywrap.patch b/dev-lang/c-intercal/files/c-intercal-30.0-yywrap.patch
deleted file mode 100644
index 9d46a91beceb..000000000000
--- a/dev-lang/c-intercal/files/c-intercal-30.0-yywrap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/604848
-
---- intercal-0.30-orig/src/lexer.l
-+++ intercal-0.30/src/lexer.l
-@@ -38,12 +38,10 @@
- /*#undef wchar_t*/
- /*#define wchar_t unsigned char*/
- 
--#ifndef yywrap
- static int yywrap(void)
- {
-     return 1;
- }
--#endif /* yywrap */
- 
- int 	iyylineno = 1;
- 
diff --git a/dev-lang/c-intercal/files/c-intercal-31.0-no-common.patch b/dev-lang/c-intercal/files/c-intercal-31.0-no-common.patch
new file mode 100644
index 000000000000..ff409aeb2518
--- /dev/null
+++ b/dev-lang/c-intercal/files/c-intercal-31.0-no-common.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/711902
+
+--- intercal-0.31-orig/src/perpet.c
++++ intercal-0.31/src/perpet.c
+@@ -85,7 +85,7 @@
+ /* function created by yacc */
+ extern int yyparse(void);
+ 
+-int yydebug;
++extern int yydebug;
+ 
+ /* compilation options */
+ bool compile_only; 	/* just compile into C, don't run the linker */