gentoo resync : 15.06.2021

4 files changed, 0 insertions, 158 deletions

diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 4a6ea220946f..761be7590614 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -1,8 +1,5 @@
 AUX libmcpp-2.7.2-fix-build-system.patch 1008 BLAKE2B d9a87af2faada430c9bd09bb6d4e70f51385725b45dd380b6eecd67e82ed6f2e001f3768b03e08864055fe4119187cf26efd3f09463c64072a9647f63ad251d1 SHA512 25e2e9cd8d18080947a84c0d76f0b34d74b289ccc7c6172278908c026dd6f7379ebb268aae79c3e8ab458f3883aa212e54a137cbaab336c1277acdad07a13a01
-AUX libmcpp-2.7.2-gniibe.patch 1039 BLAKE2B 2d69c087602432013c86cfe3a54f67e113842b0ae1cb9d293862f9ab1956c0b38a86a93c294936eb9e43c9fc6f7c8726bcfe198d0cdd9ede68bb05acec340e46 SHA512 a31a0f2e7430381e5e62ea4257a35891ce9d2f3beed60c6caad3b6d298a58557e9c850223840ef8c6f6c2e8139cf4a4edf29ac93b2532680feafba503fcfaf6d
-AUX libmcpp-2.7.2-zeroc.patch 2342 BLAKE2B d33a7539044a084ce42d5655db298c92b288574ae677621ccbde252abbc46ea7f5c071c500431e2e761c6158944beb2efd7fa95ec8cebd4e5ea1ce3a6ddf4af9 SHA512 86b2e851490e180dfe3028a5a37019ea423924c921ab053a642fb78d4533a87f913ede2928daf9da4daf60e67795a24521186b40c76961ae99ebeb75f8aa95ad
 DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
 DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be
-EBUILD libmcpp-2.7.2-r3.ebuild 843 BLAKE2B a2e1db534a44b4a030c750e38c9e948cca083ec61006a2da7494b0f5d07d3e70b86851f90d0ed6a67762c5422de3ce27383a9bb0016a19815ac59283447fc76e SHA512 e92af5e7f009dd942a204088466e7812a5c6bbae9e36a2a56e544f148daeb31c79b1415542ea0bc8a59c4e1fe0ec12a9aba04cf2976b3e642118651d32fbe4ff
 EBUILD libmcpp-2.7.2_p5.ebuild 891 BLAKE2B 9ee84971fc7f77a78d0cb144a809217d597f5448c609225ccd87fc48c8920b36539b8a8d92bbbd9e9896d268e69ab12be8061293a7ff98dcf0a72d2abf158d6d SHA512 fe30f0c6442ad13262589c5e4aa0dd9fabb5ed180b977db59662131b3230118dfd6135f0a8f7a622b33075120c83905fefc507af3b3fd8db6fbe72d55c54157e
 MISC metadata.xml 241 BLAKE2B 243a081993d2297570d94667e0858f3a05bc5a214321a6d5a132f0b7a20a4cdfd9fdd1ccfd9e4753e6ea74e26907b167c484e504671e68458664d0fee31e1a2b SHA512 d242d2c5f6c5b13d0380745c59f6d4672fefcf85b888df7bc88f4501853f262eb1f615b25787ad4bce10fb8b5aad23de076feff3350f214be3d3793a3d249444
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch
deleted file mode 100644
index cb5aa6c345ce..000000000000
--- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Simple fixes
- * Fix freeing unmalloced memory
-   The memory of 'in_file' is not malloced, but points to argv[].
-   It is wrong to free it.
- * When there is no input file specified by argv, it causes error
-   and fp_in == NULL.  Check is needed to call fclose for fp_in.
-Author: NIIBE Yutaka
-
-## Fixes the issue reported at:
-## http://www.forallsecure.com/bug-reports/6b11b6fccda17cc467e055ccf7fec3fa2d89ec00/
-
-Index: mcpp-2.7.2/src/main.c
-===================================================================
---- mcpp-2.7.2.orig/src/main.c	2013-07-09 03:03:05.610947658 +0000
-+++ mcpp-2.7.2/src/main.c	2013-07-09 03:03:05.534947624 +0000
-@@ -428,16 +428,11 @@
- 
- fatal_error_exit:
- #if MCPP_LIB
--    /* Free malloced memory */
--    if (mcpp_debug & MACRO_CALL) {
--        if (in_file != stdin_name)
--            free( in_file);
--    }
-     clear_filelist();
-     clear_symtable();
- #endif
- 
--    if (fp_in != stdin)
-+    if (fp_in && fp_in != stdin)
-         fclose( fp_in);
-     if (fp_out != stdout)
-         fclose( fp_out);
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch
deleted file mode 100644
index fff5d321fe98..000000000000
--- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Description: Fixes by ZeroC, Inc.
-Author: ZeroC, Inc.
-Bug-Debian: http://bugs.debian.org/611749
-
---- mcpp-2.7.2.orig/src/main.c
-+++ mcpp-2.7.2/src/main.c
-@@ -326,6 +326,8 @@ static void     init_main( void)
-             = FALSE;
-     option_flags.trig = TRIGRAPHS_INIT;
-     option_flags.dig = DIGRAPHS_INIT;
-+    sh_file = NULL;
-+    sh_line = 0;
- }
- 
- int     mcpp_lib_main
---- mcpp-2.7.2.orig/src/support.c
-+++ mcpp-2.7.2/src/support.c
-@@ -188,7 +188,7 @@ static char *   append_to_buffer(
-     size_t      length
- )
- {
--    if (mem_buf_p->bytes_avail < length) {  /* Need to allocate more memory */
-+    if (mem_buf_p->bytes_avail < length + 1) {  /* Need to allocate more memory */
-         size_t size = MAX( BUF_INCR_SIZE, length);
- 
-         if (mem_buf_p->buffer == NULL) {            /* 1st append   */
-@@ -1722,6 +1722,8 @@ com_start:
-                     sp -= 2;
-                     while (*sp != '\n')     /* Until end of line    */
-                         mcpp_fputc( *sp++, OUT);
-+                    mcpp_fputc( '\n', OUT);
-+                    wrong_line = TRUE;
-                 }
-                 goto  end_line;
-             default:                        /* Not a comment        */
---- mcpp-2.7.2.orig/src/internal.H
-+++ mcpp-2.7.2/src/internal.H
-@@ -390,6 +390,8 @@ extern char * const     work_end;   /* E
- extern char     identifier[];       /* Lastly scanned name          */
- extern IFINFO   ifstack[];          /* Information of #if nesting   */
- extern char     work_buf[];
-+extern FILEINFO * sh_file;
-+extern int      sh_line;
-         /* Temporary buffer for directive line and macro expansion  */
- 
- /* main.c   */
-@@ -557,6 +559,6 @@ extern void     init_system( void);
- #endif
- #endif
- 
--#if HOST_HAVE_STPCPY
-+#if HOST_HAVE_STPCPY && !defined(stpcpy)
- extern char *   stpcpy( char * dest, const char * src);
- #endif
---- mcpp-2.7.2.orig/src/system.c
-+++ mcpp-2.7.2/src/system.c
-@@ -3858,6 +3858,9 @@ static int  chk_dirp(
- }
- #endif
- 
-+FILEINFO*       sh_file;
-+int             sh_line;
-+
- void    sharp(
-     FILEINFO *  sharp_file,
-     int         flag        /* Flag to append to the line for GCC   */
-@@ -3868,8 +3871,6 @@ void    sharp(
-  * else (i.e. 'sharp_file' is NULL) 'infile'.
-  */
- {
--    static FILEINFO *   sh_file;
--    static int  sh_line;
-     FILEINFO *  file;
-     int         line;
- 
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
deleted file mode 100644
index b2aa110f1885..000000000000
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=${P/lib/}
-
-DESCRIPTION="A portable C++ preprocessor"
-HOMEPAGE="http://mcpp.sourceforge.net"
-SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
-	"${FILESDIR}"/${PN}-2.7.2-zeroc.patch
-	"${FILESDIR}"/${PN}-2.7.2-gniibe.patch
-)
-
-src_prepare() {
-	default
-
-	# bug #778461
-	sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-mcpplib \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}