Bump EAPI; respect CC and use LDFLAGS correctly for as-needed; use dobin instead...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/app-text/getxbook/ChangeLog b/app-text/getxbook/ChangeLog
index 63c164111700ae36c4861eda8c557f3f9bf739ab..674abefadd643da111fba8bbdc9f8e7525f30dcf 100644 (file)
--- a/app-text/getxbook/ChangeLog
+++ b/app-text/getxbook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/getxbook
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/getxbook/ChangeLog,v 1.5 2014/08/06 07:09:33 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/getxbook/ChangeLog,v 1.6 2015/03/21 09:25:25 jlec Exp $
+
+*getxbook-1.0-r1 (21 Mar 2015)
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> +getxbook-1.0-r1.ebuild,
+  -getxbook-1.0.ebuild, files/getxbook-1.0.patch, metadata.xml:
+  Bump EAPI; respect CC and use LDFLAGS correctly for as-needed; use dobin
+  instead of exeinto && doexe
 
   06 Aug 2014; Patrick Lauer <patrick@gentoo.org> getxbook-1.0.ebuild:
   Make description more repoman-happy

diff --git a/app-text/getxbook/Manifest b/app-text/getxbook/Manifest
index 0ad137e89d06ccbb02c8c4eef0158660e47fd9e1..7649ebb242b824153340577e14851dea747a9918 100644 (file)
--- a/app-text/getxbook/Manifest
+++ b/app-text/getxbook/Manifest
@@ -1,5 +1,27 @@
-AUX getxbook-1.0.patch 505 SHA256 06f7dbf151415a9d88667b40bacc77d1a5818498c3945376542bcd76705c50bb SHA512 cf916b8f8e5768f8259d69717b4eca049aaca1aa49fc4d457a18cd0ca9ef08a609b2a5dd34ab186a26320e067028b416ceaf5c052a7e0b1d049125ef09695824 WHIRLPOOL 90afe3d9cc707aace65e866f2097b9dc38653a6cc28a0e1d4db851c50fd4b2df60fc5b5b07abf08156013e5969fa4afd644f34a8ed49cec6f185e14217f5ebe8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX getxbook-1.0.patch 863 SHA256 ceaa5f841154f9ce5458e71424dbe1000203634680e516aa09ee3ff538671811 SHA512 3b953cafff23f01918eb910d06cc6bc81d8420fbbe18cfa3cab59458977c7a843ac62ef8789ce0883c225200593f657efce593afcd5bc9a8d87a8f30784ed0cc WHIRLPOOL 2388bd79fdb1de0f173a30aad7d89970575efc12619e55bb5d6bef1d9c806d01e87cc144cfb94dd9547df5817964b9c32a934a5d59fcd51472c329cba82f5c27
 DIST getxbook-1.0.tar.bz2 22314 SHA256 ce0f7d0bcd9002d31c94617cecde8145cbc138a2ab3aed1a75af26b26e3e9521 SHA512 df912e67ddd823e4b1ce1539522ef0804f74758aa27baa0c568790859fac97d40dbc8f574be936fdf3ba8a1135bcc3d9af1bedf0205353d7a12f8993393fe941 WHIRLPOOL 863b3c21b7c79166d3ac14cc7e11971b6aee4ba724eef48362bdf56b58fba21fd61a9162a2839b4f981cf6e2dd61228b69ea00adad8b84a62cf14530dd45d580
-EBUILD getxbook-1.0.ebuild 1088 SHA256 08ff1e4b53b815b583b247323d3456f9a45670cc542fa21a9b3e428d0c47f38b SHA512 322cd6568527a9646d0c880a6a263f3a433de90685b97c3b64bc80e299511f5b6d17677713b802467e8d09e1917c4a3af95570ce13d3c10f550321f515202060 WHIRLPOOL d26306e5e27ee0288e9c8c5e129be6aeb40cd3963d089501bfcd8649fcdde3bb6be77dc6da411cbff148b43eab7d92ae70cb51242337a47bd7a77cf5fbfb85c9
-MISC ChangeLog 986 SHA256 23fb58e0b36903d9c45916dbe0fdfdc952ccea456754484b33e22ad5c5d0701b SHA512 18ebc4fc400fb85df885d4f58017710ce547cde63d813e9de50d545664438a912d5fba91cea02f4b628ff2da9352248cb0a638f6094de5ef301596cdd5e7e3d2 WHIRLPOOL 08663525aa7410bcae80b3924db7426b17d55e60d42c47a9593ac46b629acb56f643c94ae94824ebaed39c4f2261329de1281971cc2d21d4a06f8e6a43ef8b02
-MISC metadata.xml 615 SHA256 4f4c2de046a2cbd1dc17fc7503046aed1a9d084f93ae3c5717877f8506befb67 SHA512 73a361b2e3fadeae8419b07023059343ae3e19b22c547c3ac916ef59d28336efa7ecf7ffe103aa5e2f0309295c93ec584a30946a32d5bf8959187cd137e72e31 WHIRLPOOL f96d096704467a7193165ea8c71811462e5e12552d1515153085fd980e5a7b7f4ed87d2c308b927282a86202c0377f5d7366a47a3a42c5ff3272401dcace4065
+EBUILD getxbook-1.0-r1.ebuild 1048 SHA256 693c1f7180c8afcf3da9cf2f104de21f3fbd2c4667a45b799ab30810d64f5c46 SHA512 9d06aaea462347011d8aa8389385a0050ba11211e795169933ed4bf65b3213ff6508e183250a41ec811f51600907ff7b5de5bd78c13c4ee0962f5ef7eda351d0 WHIRLPOOL 43a42ac15a2fb56a2e18902ce344f3b01a4421e80725586bb1ed9e2c5c443cb7e467be80be04458510eeaacef9155d3a1cf8437f85ca747a0b44485700649c87
+MISC ChangeLog 1257 SHA256 9bdb5c2649f618ef0e0fa7249709073f093008de372c020d3a467b656e48837b SHA512 61e53e6f16d3629e48ae065bf5e890dfc29f3cd7a8b76d8a7ead29e8f3fce2abbfa7c929baebd702dcf7ad9c8c693a55b740b95874b39f03a7819ad1e3c305d0 WHIRLPOOL f43de2d029ca8c6413ffc264cd248d5a4524a15f61ff2863f2430945cf9a3b78b68d7d7b0b5ae2cc1379ed0808cfaf8ba7154fcb40ab5ab5f6ee72f496935880
+MISC metadata.xml 621 SHA256 afe9616537a7c6277f2c51661f5258e9e038f7886da1afe582f5e754dbee9705 SHA512 230aa32740dd61dd3535d27d80702ce347d2b3123aeb1423a91977e68bc4541fb19861374da10b9df55030dc3e8a9c98137055f01cd161629731cb245bafe6f4 WHIRLPOOL 63e680b4de068127460165dea1c20f73da57b7d6fc8f475c4ca8e4632a79268a03ecac527af654f418f8cceca1bb1267baff01a29e7c57ab6a2f13c29e6a645b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDTkKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirP6cP/REKAAcLJgHoL/G1GrRqu9ng
+QCF44sH3IvM86hmLZzkt1pk6ex1bA7efa60xd4Xwm4MaaKi06rbo+fFzO1Y6dnGB
+fZfpgMj7ehAUMOGZzQh/DmjycyvOnRFvNSC7pq+IJbPUr5EpIiWvSgjVHYTeDZqR
+lG20ZFBtV3Wn8n+y4uGWIc5nyHzPMR1jx5c+cCt2YOFG/Cofh+PqvIKqoiZs7s9z
+oZ30Q8qQJhMx1hvjGr7L7TaPjOvi89yxXyhzpS7XSyM38tYpKtn5Ws0WMZLtAfY/
+xoomrX//e39s+KAtdCA6aAhtnqvvjAE4ahjCtuIgVw0aziBKVta40ztlGszja5s8
+yybMdNAkjYyhTnV+wBRtsASDMqGBHxrdfYCluwVbmBJCRk/jdEgO52PvWmbu4X8K
+pZown7fn7yLaMMDFbKl5Rz3ve0EE4uR0O0huRN4Mo9nbajRZLVZWsFsr/VXpaqSl
+gweIeurmSmLycEVL0aYoU6OE7TAM56+k/X+f2z3DnNInJHYJjamAwptQ6+cLOT6N
+iXJ6fbTYKwFcUDnFZUNSwof2LJ98/PBZc2KrkLXtQFGxNdO7xEQs18bYfiABkRSn
+gW8tGMyuuGiHeKNFWX+sXAUnsqhbv12UJVldwr2kiis1n9ewy4owcmd8CFQpbox+
+EwRKGkejwJDIh6r91F3I
+=jHMJ
+-----END PGP SIGNATURE-----

diff --git a/app-text/getxbook/files/getxbook-1.0.patch b/app-text/getxbook/files/getxbook-1.0.patch
index 5f38e7f28f511a2d0d66caedb5005bb5cb2544b8..50da6328bf8a7c1733fefc7898730ebd08b45dc6 100644 (file)
--- a/app-text/getxbook/files/getxbook-1.0.patch
+++ b/app-text/getxbook/files/getxbook-1.0.patch
@@ -1,15 +1,42 @@
-diff -r -U1 getxbook-0.8.orig/Makefile getxbook-0.8/Makefile
---- getxbook-0.8.orig/Makefile 2012-02-15 05:09:56.000000000 +0700
-+++ getxbook-0.8/Makefile      2012-02-15 15:11:55.000000000 +0700
-@@ -1,3 +1,10 @@
+ Makefile | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f6507b5..d080f2b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,12 @@
  # See COPYING file for copyright and license details.
 -include config.mk
 +VERSION = 1.0
 +RELDATE = 2012-08-19
 +PREFIX = /usr
 +MANPREFIX = $(PREFIX)/share/man
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror \
++CFLAGS += -std=c99 -pedantic -Wall -Wextra \
 +          -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
-+CC = cc
++CC ?= cc
 +LD = $(CC)
  
+ NAME = getxbook
+ 
+@@ -20,16 +27,16 @@ $(BIN): util.a
+ 
+ .o:
+       @echo LD $@
+-      @$(LD) -o $@ $< util.a $(LDFLAGS)
++      $(LD) $(LDFLAGS) -o $@ $< util.a
+ 
+ .c.o:
+       @echo CC $<
+-      @$(CC) -c $(CFLAGS) $<
++      $(CC) -c $(CFLAGS) $<
+ 
+ util.a: $(LIB)
+       @echo AR $@
+-      @$(AR) -r -c $@ $(LIB)
+-      @ranlib $@
++      $(AR) -r -c $@ $(LIB)
++      $(RANLIB) $@
+ 
+ install: all
+       mkdir -p $(DESTDIR)$(PREFIX)/bin

diff --git a/app-text/getxbook/getxbook-1.0-r1.ebuild b/app-text/getxbook/getxbook-1.0-r1.ebuild
new file mode 100644 (file)
index 0000000..d83eefc
--- /dev/null
+++ b/app-text/getxbook/getxbook-1.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/getxbook/getxbook-1.0-r1.ebuild,v 1.1 2015/03/21 09:25:25 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Download books from google, amazon, barnes and noble"
+HOMEPAGE="http://njw.me.uk/software/getxbook/"
+SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf djvu ocr tk"
+
+DEPEND=""
+RDEPEND="
+       djvu? ( app-text/djvu )
+       pdf? ( media-gfx/imagemagick )
+       ocr? (
+               app-text/tesseract
+               pdf? ( media-gfx/exact-image app-text/pdftk )
+               )
+       tk? ( dev-lang/tk:0= )"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}.patch
+       tc-export CC AR RANLIB
+}
+
+src_install() {
+       DOCS=( README LEGAL )
+       default
+
+       use pdf  && dobin extras/mkpdf.sh
+       use djvu && dobin extras/mkdjvu.sh
+
+       if use ocr; then
+               dobin extras/mkocrtxt.sh
+               use pdf  && dobin extras/mkocrpdf.sh
+               use djvu && dobin extras/mkocrdjvu.sh
+       fi
+       use tk && dobin getxbookgui.tcl
+}

diff --git a/app-text/getxbook/getxbook-1.0.ebuild b/app-text/getxbook/getxbook-1.0.ebuild
deleted file mode 100644 (file)
index 65795c3..0000000
--- a/app-text/getxbook/getxbook-1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/getxbook/getxbook-1.0.ebuild,v 1.3 2014/08/06 07:09:33 patrick Exp $
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Download books from google, amazon, barnes and noble"
-HOMEPAGE="http://njw.me.uk/software/getxbook/"
-SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf djvu ocr tk"
-
-DEPEND=""
-RDEPEND="djvu? ( app-text/djvu )
-       pdf? ( media-gfx/imagemagick )
-       ocr? ( app-text/tesseract
-               pdf? ( media-gfx/exact-image app-text/pdftk ) )
-       tk? ( dev-lang/tk )"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}.patch
-}
-
-src_compile() {
-       tc-export CXX
-       emake
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       dodoc README LEGAL
-       exeinto /usr/bin
-       use pdf  && doexe extras/mkpdf.sh
-       use djvu && doexe extras/mkdjvu.sh
-       if use ocr; then
-               doexe extras/mkocrtxt.sh
-               use pdf  && doexe extras/mkocrpdf.sh
-               use djvu && doexe extras/mkocrdjvu.sh
-       fi
-       use tk && doexe getxbookgui.tcl
-}

diff --git a/app-text/getxbook/metadata.xml b/app-text/getxbook/metadata.xml
index 25d7048b9a78faf2f569eb9a3c5ff34151a0cdd2..5569be9d22393e613d73bdf56dbb8b960c55efce 100644 (file)
--- a/app-text/getxbook/metadata.xml
+++ b/app-text/getxbook/metadata.xml
@@ -12,7 +12,7 @@
     barnes and noble's "book viewer",
     optionally using tesseract to produce OCRed pdf or djvu.
   </longdescription>
-<use>
-  <flag name='ocr'>Use <pkg>app-text/tesseract</pkg> for optical character recognition</flag>
-</use>
+  <use>
+    <flag name="ocr">Use <pkg>app-text/tesseract</pkg> for optical character recognition</flag>
+  </use>
 </pkgmetadata>