commit: bc997e1fe5c259b699bb9b137f42c8be63dd9313 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Dec 29 11:35:15 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Dec 29 13:16:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc997e1f
app-arch/afio: [QA] Minor touchups Bug: https://bugs.gentoo.org/429360 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-arch/afio/afio-2.5.1-r1.ebuild | 9 ++++----- .../afio/files/afio-2.5.1-fix-build-system.patch | 22 ++++++++++++++++++++++ app-arch/afio/metadata.xml | 12 ++++++------ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/app-arch/afio/afio-2.5.1-r1.ebuild b/app-arch/afio/afio-2.5.1-r1.ebuild index 0c3a74af973..a3e6e5c082e 100644 --- a/app-arch/afio/afio-2.5.1-r1.ebuild +++ b/app-arch/afio/afio-2.5.1-r1.ebuild @@ -13,10 +13,9 @@ LICENSE="Artistic LGPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" -PATCHES=( "${FILESDIR}"/Makefile-r1.patch ) +PATCHES=( "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch ) -src_prepare() { - default +src_configure() { tc-export CC } @@ -27,7 +26,7 @@ src_install() { local i for i in {1..4}; do - docinto "script$i" - dodoc "script$i"/* + docinto "script${i}" + dodoc -r "script${i}"/. done } diff --git a/app-arch/afio/files/afio-2.5.1-fix-build-system.patch b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch new file mode 100644 index 00000000000..5f3e8355c1a --- /dev/null +++ b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch @@ -0,0 +1,22 @@ +--- a/Makefile ++++ b/Makefile +@@ -71,15 +71,12 @@ + MW= + #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations + +-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} +- +-CC=gcc +- +-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I +-LDFLAGS = ++CC ?= gcc ++CFLAGS += -Wall -Wstrict-prototypes ++CPPFLAGS += ${LARGEFILEFLAGS} ${2} ${3} ${6} ${8} ${c} ${d} ${e2} ${f} ${g} + + afio : afio.o compfile.o exten.o match.o $M +- ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ + + clean: + rm -f *.o afio diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml index b232df5209c..1d91069b9e1 100644 --- a/app-arch/afio/metadata.xml +++ b/app-arch/afio/metadata.xml @@ -3,12 +3,12 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription> -Afio makes cpio-format archives. It deals somewhat gracefully -with input data corruption, supports multi-volume archives during interactive -operation, and can make compressed archives that are much safer than compressed -tar or cpio archives. Afio is best used as an 'archive engine' in a backup -script. -</longdescription> + Afio makes cpio-format archives. It deals somewhat gracefully + with input data corruption, supports multi-volume archives during interactive + operation, and can make compressed archives that are much safer than compressed + tar or cpio archives. Afio is best used as an 'archive engine' in a backup + script. + </longdescription> <upstream> <remote-id type="freshmeat">afio</remote-id> </upstream>
