From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57B04139084 for ; Thu, 28 Dec 2017 12:03:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3A60E0E40; Thu, 28 Dec 2017 12:03:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73C13E0E40 for ; Thu, 28 Dec 2017 12:03:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6056F341301 for ; Thu, 28 Dec 2017 12:03:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEB09AFBE for ; Thu, 28 Dec 2017 12:03:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1514462565.6e1fce08ef2312dab94e37973c249e52e686e10f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rats/files/, dev-util/rats/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/rats/files/rats-2.4-fix-build-system.patch dev-util/rats/rats-2.4.ebuild X-VCS-Directories: dev-util/rats/files/ dev-util/rats/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6e1fce08ef2312dab94e37973c249e52e686e10f X-VCS-Branch: master Date: Thu, 28 Dec 2017 12:03:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0883f9d-4455-4d22-9881-566eddd58374 X-Archives-Hash: 057a47817ed27f1c757101c8cc15954e commit: 6e1fce08ef2312dab94e37973c249e52e686e10f Author: David Seifert gentoo org> AuthorDate: Thu Dec 28 10:28:16 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Dec 28 12:02:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1fce08 dev-util/rats: Port to EAPI 6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../rats/files/rats-2.4-fix-build-system.patch | 27 ++++++++++++++++++++++ dev-util/rats/rats-2.4.ebuild | 25 +++++++++++--------- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dev-util/rats/files/rats-2.4-fix-build-system.patch b/dev-util/rats/files/rats-2.4-fix-build-system.patch new file mode 100644 index 00000000000..42972876a5c --- /dev/null +++ b/dev-util/rats/files/rats-2.4-fix-build-system.patch @@ -0,0 +1,27 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -50,15 +50,15 @@ + $(LEX) $(LEXFLAGS) -Pyyruby ruby-lex.l + + install: $(BIN) +- ./mkinstalldirs $(BINDIR) $(LIBDIR) $(MANDIR) $(MANDIR)/man1 $(SHAREDIR) +- $(INSTALL_PROGRAM) $(BIN) $(BINDIR) +- $(INSTALL_DATA) rats-python.xml $(SHAREDIR) +- $(INSTALL_DATA) rats-c.xml $(SHAREDIR) +- $(INSTALL_DATA) rats-perl.xml $(SHAREDIR) +- $(INSTALL_DATA) rats-php.xml $(SHAREDIR) +- $(INSTALL_DATA) rats-ruby.xml $(SHAREDIR) +- $(INSTALL_DATA) rats-openssl.xml $(SHAREDIR) +- $(INSTALL_DATA) rats.1 $(MANDIR)/man1 ++ ./mkinstalldirs $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(SHAREDIR) ++ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR) ++ $(INSTALL_DATA) rats-python.xml $(DESTDIR)$(SHAREDIR) ++ $(INSTALL_DATA) rats-c.xml $(DESTDIR)$(SHAREDIR) ++ $(INSTALL_DATA) rats-perl.xml $(DESTDIR)$(SHAREDIR) ++ $(INSTALL_DATA) rats-php.xml $(DESTDIR)$(SHAREDIR) ++ $(INSTALL_DATA) rats-ruby.xml $(DESTDIR)$(SHAREDIR) ++ $(INSTALL_DATA) rats-openssl.xml $(DESTDIR)$(SHAREDIR) ++ $(INSTALL_DATA) rats.1 $(DESTDIR)$(MANDIR)/man1 + + clean: + rm -f $(OBJ) *~ $(BIN) core diff --git a/dev-util/rats/rats-2.4.ebuild b/dev-util/rats/rats-2.4.ebuild index 1c49b7c4df4..0a41658a990 100644 --- a/dev-util/rats/rats-2.4.ebuild +++ b/dev-util/rats/rats-2.4.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 + inherit eutils DESCRIPTION="RATS - Rough Auditing Tool for Security" @@ -13,23 +14,25 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" -DEPEND="dev-libs/expat" +RDEPEND="dev-libs/expat:=" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-2.4-fix-build-system.patch ) src_prepare() { - edos2unix $(find "${S}" -name '*.[chl]' -o -name '*.in' -o -name '*.am') - #epatch "${FILESDIR}"/${PN}-2.1-add-getopt-trailing-null.patch - #epatch "${FILESDIR}"/${PN}-2.1-fix-null-pointers.patch + default + + local f + while IFS="" read -d $'\0' -r f; do + einfo "Converting ${f} from CRLF to LF" + edos2unix "${f}" + done < <(find \( -name '*.[chl]' -o -name '*.in' -o -name '*.am' \) -print0) } src_configure() { econf --datadir="${EPREFIX}/usr/share/${PN}/" } -src_install () { - einstall SHAREDIR="${ED}/usr/share/${PN}" MANDIR="${ED}/usr/share/man" - dodoc README README.win32 -} - pkg_postinst() { ewarn "Please be careful when using this program with it's force language" ewarn "option, '--language ' it may take huge amounts of memory when"