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 8920513832E for ; Sun, 31 Jul 2016 19:07:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C10B821C012; Sun, 31 Jul 2016 19:07:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 502FF21C012 for ; Sun, 31 Jul 2016 19:07:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F428340C6F for ; Sun, 31 Jul 2016 19:07:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F31187DD for ; Sun, 31 Jul 2016 19:07:08 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1469991661.c12d97d4bf183e39bed8b04c5f066fcee0063530.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/arj/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/arj/Manifest app-arch/arj/arj-3.10.22-r6.ebuild app-arch/arj/arj-3.10.22-r7.ebuild X-VCS-Directories: app-arch/arj/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: c12d97d4bf183e39bed8b04c5f066fcee0063530 X-VCS-Branch: master Date: Sun, 31 Jul 2016 19:07:08 +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: c57437df-6180-4359-ae2f-84291b2280a3 X-Archives-Hash: 2bafc9c67c484a022ddffd554859ec53 commit: c12d97d4bf183e39bed8b04c5f066fcee0063530 Author: Michael Orlitzky gentoo org> AuthorDate: Sun Jul 31 19:00:42 2016 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Sun Jul 31 19:01:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12d97d4 app-arch/arj: new revision with Debian patchlevel 15. This new revision updates the Debian patchlevel from 14 to 15. Some other minor cleanups were made: * No longer append -Wall to CFLAGS (why?). * Clear the gnu/stripgcc.lnk in src_prepare() instead of using sed to disable it in src_compile(). Doing so in src_prepare() is more semantically correct, and should work the same. * Don't pass ARJLIBDIR, CC, libdir, ADD_LDFLAGS, or pkglibdir to emake. I think these are obsolete; the build system correctly identifies my libdir, compiler, CFLAGS, LDFLAGS, etc. * Add a few more docs, and switch to using the DOCS variable. * Use the default src_compile() and src_install(). Package-Manager: portage-2.2.28 app-arch/arj/Manifest | 2 +- ...arj-3.10.22-r6.ebuild => arj-3.10.22-r7.ebuild} | 40 ++++++++++------------ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest index c84190b..e2a7c2f 100644 --- a/app-arch/arj/Manifest +++ b/app-arch/arj/Manifest @@ -1,3 +1,3 @@ DIST arj_3.10.22-13.debian.tar.xz 15904 SHA256 d74588f13a2de780d762d3405b0216a02cf4e55bda4ac4703cab94310ac3ea46 SHA512 670f9fb69f1f4363a4d277151bc99286de024764a99ca5276e9f46d560718a906657ec6e2898290f57fbf1007c9190959d38de14ecd1d3205fb26323eff6795d WHIRLPOOL b1111dc6dce1d3810819d6773a27b5d9642ea421e571fe1fa7eac0f4dfb16625769d57a4378613ca7f1b58531593f55044ef6efcb41a56fc4afd2a65c290c53f -DIST arj_3.10.22-14.debian.tar.xz 16436 SHA256 992b740d8cce5e5c5c866f625a2201514930191548ee56df27c34905ea4be665 SHA512 a5d8cba4761e34324ac00275040c808597e4ec9efb46c1f97f894f9ecd6d29b3e5858d953d1bbe7d5f82226683003d128544e04e3e5cded6c38e9c87746a437e WHIRLPOOL 3974347c8795536645994865a15d1f39079542fe3b689e3311ff86daac83d9f1ac3ad3832aff453e6abc0f9737071e4c55f1012e1f97a2e237fae9a557cd368c +DIST arj_3.10.22-15.debian.tar.xz 16756 SHA256 69d7f2a94c0a7c76e276904cae98a977fbc5275b3db6e020e2a414b5d91f422f SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688 WHIRLPOOL 79c02a23b9ea47cf91c0f8d6441c5b7a7e11c165fb833b8f39e2ee0aafcfdb4c2678e066d27fc7b387efbc190234997c302d9ca58b38b93c14ab04a516e223f7 DIST arj_3.10.22.orig.tar.gz 431467 SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76 WHIRLPOOL 86223959a938898126c544a75cbc0c4885777fe2eda3ccad2bbae47f8e3a31a409e2dca0dbbde8333e8c2ac77a1f350c7d95bbcba002f88ee94420f31d957319 diff --git a/app-arch/arj/arj-3.10.22-r6.ebuild b/app-arch/arj/arj-3.10.22-r7.ebuild similarity index 59% rename from app-arch/arj/arj-3.10.22-r6.ebuild rename to app-arch/arj/arj-3.10.22-r7.ebuild index b5ce2dd..52126ca 100644 --- a/app-arch/arj/arj-3.10.22-r6.ebuild +++ b/app-arch/arj/arj-3.10.22-r7.ebuild @@ -4,13 +4,13 @@ EAPI=6 -inherit autotools toolchain-funcs +inherit autotools -PATCH_LEVEL=14 +PATCH_LEVEL=15 MY_P="${PN}_${PV}" DESCRIPTION="Utility for opening arj archives" -HOMEPAGE="http://arj.sourceforge.net" +HOMEPAGE="http://arj.sourceforge.net/" SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz mirror://debian/pool/main/a/arj/${MY_P}-${PATCH_LEVEL}.debian.tar.xz" @@ -27,28 +27,26 @@ PATCHES=( "${FILESDIR}/${P}-interix.patch" ) +DOCS=( + doc/compile.txt + doc/debug.txt + doc/glossary.txt + doc/rev_hist.txt + doc/xlation.txt +) + src_prepare() { default - cd gnu || die - mv configure.{in,ac} || die - eautoreconf -} + cd gnu || die 'failed to change to the "gnu" directory' + echo -n "" > stripgcc.lnk || die "failed to disable stripgcc.lnk" -src_configure() { - cd gnu || die - CFLAGS="${CFLAGS} -Wall" econf -} - -src_compile() { - sed -i -e '/stripgcc/d' GNUmakefile || die + # This gets rid of the QA warning, but should be fixed upstream... + mv configure.{in,ac} || die 'failed to move configure.in to configure.ac' - ARJLIBDIR="${EPREFIX}/usr/$(get_libdir)" - emake CC=$(tc-getCC) libdir="${ARJLIBDIR}" \ - ADD_LDFLAGS="${LDFLAGS}" \ - pkglibdir="${ARJLIBDIR}" all + eautoreconf } -src_install() { - emake pkglibdir="${ARJLIBDIR}" DESTDIR="${D}" install - dodoc doc/rev_hist.txt +src_configure() { + cd gnu || die 'failed to change to the "gnu" directory' + econf }