[gentoo-commits] repo/gentoo:master commit in: app-arch/unrar-gpl/files/, profiles/, app-arch/unrar-gpl/

[gentoo-commits] repo/gentoo:master commit in: app-arch/unrar-gpl/files/, profiles/, app-arch/unrar-gpl/

[Aaron Bauman]

commit:     4e37ce8b9eae1785939058f0d5af4d2e3422b5cc
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr 29 08:23:49 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May  5 01:43:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e37ce8b

app-arch/unrar-gpl: treeclean

Closes: https://bugs.gentoo.org/628432
Closes: https://github.com/gentoo/gentoo/pull/8196

 app-arch/unrar-gpl/Manifest                        |  1 -
 .../unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch  | 63 ----------------------
 app-arch/unrar-gpl/metadata.xml                    |  7 ---
 .../unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild  | 24 ---------
 .../unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild  | 32 -----------
 profiles/package.mask                              |  5 --
 6 files changed, 132 deletions(-)

diff --git a/app-arch/unrar-gpl/Manifest b/app-arch/unrar-gpl/Manifest
deleted file mode 100644
index f0594f72ea2..00000000000
--- a/app-arch/unrar-gpl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unrar-gpl-0.0.1_p20080417.tar.bz2 138495 BLAKE2B 228a3533375a75e0efb98758c4d28db3d546b0144c07ebe167fe9499e416c8e3f94709d5d133d6386144dfe8a25351472e1b08e6a538dfa414ce6c05e018d63f SHA512 2d0a7ee92d1ba25185b4e35c4c8aad1b5818472a48b597bf8fb7c673c8ad3c6553c29108766bd85ca8b724486ec4466a09a1f3622951dba7ffafcd8dd8d3d2a1

diff --git a/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch b/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch
deleted file mode 100644
index f1cf8ef2338..00000000000
--- a/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-* grobian@gentoo.org: allow compilation on non glibc hosts by use of an
-                      external library for argp, and check for certain
-                      headers before including them
-
---- configure.ac
-+++ configure.ac
-@@ -14,7 +14,7 @@
- 
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h])
-+AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h error.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-@@ -24,6 +24,7 @@
- AC_FUNC_MALLOC
- AC_FUNC_REALLOC
- AC_CHECK_FUNCS([atexit realpath setenv strchr])
-+AC_SEARCH_LIBS([argp_usage], [argp])
- 
- AC_CONFIG_FILES([Makefile
-                  src/Makefile])
---- src/unrar.c
-+++ src/unrar.c
-@@ -24,7 +24,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#endif
- #include <errno.h>
- #include <sys/stat.h>
- #include <sys/types.h>
---- src/opts.c
-+++ src/opts.c
-@@ -22,7 +22,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifdef HAVE_ERROR_H
- #include <error.h>
-+#endif
- #include <argp.h>
- #include <unistd.h>
- #include <sys/types.h>
---- src/opts.h
-+++ src/opts.h
-@@ -56,4 +56,13 @@
- int parse_opts (int argc, char **argv, struct arguments_t *arguments);
- int compat_parse_opts (int argc, char **argv, struct arguments_t *arguments);
- 
-+#ifndef HAVE_ERROR_H
-+#define error(S, E, ...) \
-+	fflush(stdout); \
-+	fprintf(stderr, "unrar: " __VA_ARGS__); \
-+	if (E != 0) fprintf(stderr, ": %s", strerror(E)); \
-+	fprintf(stderr, "\n"); \
-+	if (S != 0) exit(S);
-+#endif
-+
- #endif

diff --git a/app-arch/unrar-gpl/metadata.xml b/app-arch/unrar-gpl/metadata.xml
deleted file mode 100644
index b265683d48c..00000000000
--- a/app-arch/unrar-gpl/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>hanno@gentoo.org</email>
-</maintainer>
-</pkgmetadata>

diff --git a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild
deleted file mode 100644
index 08d8305c862..00000000000
--- a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="Free rar unpacker for old (pre v3) rar files"
-HOMEPAGE="http://home.gna.org/unrar/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="AUTHORS README"
-
-S=${WORKDIR}/${PN/-gpl}
-
-src_prepare() {
-	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-}
-src_configure() { econf --program-suffix="-gpl"; }

diff --git a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild
deleted file mode 100644
index cf50c74e6c3..00000000000
--- a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools flag-o-matic
-
-DESCRIPTION="Free rar unpacker for old (pre v3) rar files"
-HOMEPAGE="http://home.gna.org/unrar/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-DEPEND="!elibc_glibc? ( dev-libs/argp dev-libs/gnulib )"
-
-DOCS="AUTHORS README"
-
-S=${WORKDIR}/${PN/-gpl}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.1-solaris.patch
-	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-
-	if [[ ${CHOST} == *-aix* || ${CHOST} == *-solaris* ]]; then
-		append-cppflags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/lib
-		append-libs -lgnu
-	fi
-}
-src_configure() { econf --program-suffix="-gpl"; }

diff --git a/profiles/package.mask b/profiles/package.mask
index 6ce730fefc8..b4171b76c6c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -475,11 +475,6 @@ sys-kernel/hardened-sources
 # Package testing tracked in bug #611022.
 >=dev-libs/msgpack-1.4.2
 
-# Hanno Boeck <hanno@gentoo.org> (21 Aug 2017)
-# Open security bugs, no upstream, bug 628432
-# Alternatives: app-arch/libarchive, app-arch/unar
-app-arch/unrar-gpl
-
 # Sébastien Fabbro <bicatali@gentoo.org> (19 Aug 2017)
 # ipython-6 is python-3 only and causes circular dependencies
 # Unset python_targets_python2_7 for ipykernel and ipyparallel if needed.