diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-11-15 12:29:36 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-11-15 12:29:36 +0000 |
| commit | bfe17f69bc5fbdc9b98741cfc4346109fb713fb7 (patch) | |
| tree | 35b0f3a6434858700d1f7114dbf9dad09c165645 /app-text/reed | |
| parent | Version bump, drop -Werror. (diff) | |
| download | historical-bfe17f69bc5fbdc9b98741cfc4346109fb713fb7.tar.gz historical-bfe17f69bc5fbdc9b98741cfc4346109fb713fb7.tar.bz2 historical-bfe17f69bc5fbdc9b98741cfc4346109fb713fb7.zip | |
Fix building against sys-libs/ncurses[tinfo] (bug #528382).
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'app-text/reed')
| -rw-r--r-- | app-text/reed/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/reed/Manifest | 10 | ||||
| -rw-r--r-- | app-text/reed/reed-5.4.ebuild | 20 |
3 files changed, 19 insertions, 16 deletions
diff --git a/app-text/reed/ChangeLog b/app-text/reed/ChangeLog index edf524e9a124..9539b5c9a72e 100644 --- a/app-text/reed/ChangeLog +++ b/app-text/reed/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/reed # Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/reed/ChangeLog,v 1.12 2014/08/10 18:31:27 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/reed/ChangeLog,v 1.13 2014/11/15 12:29:35 jer Exp $ + + 15 Nov 2014; Jeroen Roovers <jer@gentoo.org> reed-5.4.ebuild: + Fix building against sys-libs/ncurses[tinfo] (bug #528382). 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> reed-5.4.ebuild: QA: drop trailing '.' from DESCRIPTION diff --git a/app-text/reed/Manifest b/app-text/reed/Manifest index 816fbd1e45d9..f40287910f6c 100644 --- a/app-text/reed/Manifest +++ b/app-text/reed/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST reed-5.4.tar.gz 32414 SHA256 226a057aa5db705e83b685207d635d0d3b983999f1e526e0768aa56b0e7c02a8 SHA512 47216c6444ff2a53a0f6ad0e598761d078fb19099507e5687d15be7f875664d3cb9b74f2a4af8c450d179032e46785d96abc66c2bf9cd264db2f87aa089512f7 WHIRLPOOL f603ab7516bb09970ba1bdad52dc5aac7c76ceb61f7b74e3d7adf3eeb8382c7d3ce982b0a48c0b11fad041398a3c5cf7287a1b33e11bdc94aa9032ac045494cf -EBUILD reed-5.4.ebuild 956 SHA256 13528965e41c1f9b3c99696f520f086969b95aa1c8c4f0f6499d870fe5e17beb SHA512 6065c85adf8610d2f3e3119257a04e5fac75866b68d15aab52b9a35ba126d0b015977065f01e89c6bb529ac258bcccfeca2c6b9d83c4cc364a771884d1a49b44 WHIRLPOOL 708aa655f130f3f0624e606302fba60a63a029bcff2d7a30e5a496eee8c405ca06505558b691e930a5512d73403dfe3c891bb27ddab12aedbd28cd8801e3fe69 -MISC ChangeLog 1415 SHA256 0acb12de2ce4e274ceedcabcedb13754f21c614050fc0a3ff03ca27cbbdcb19d SHA512 d76151ffec99be8e730e55912b012a67d2ab1028865cbe399b5ac0a3119fafd35be2d1a0981cbffedff8f8db0efa67f8aa862dbe4efd20dafa054489e8cfb719 WHIRLPOOL 85280b79e686c1b0b86ea6d2802ce3b5f34b8d3758e748739022be205fead96cbd17646428843dbc0d212c1f1b180ff3feb48a1885d4c1f36a23caf62a8d52c9 +EBUILD reed-5.4.ebuild 1006 SHA256 b5eb06472675726a0b076efe3de209290458dc555f8e5006daa1ffe53b6dbf21 SHA512 3e56533448aa03d1c80e3b0d45dd633c33ab3210d61f5f9ce120e58514559d01cd27433418e3d9c61e66ae60a6d0cf46bdcf9efd72b455be0dc1ddb712b10b78 WHIRLPOOL 61f43fc0625d8856e1ffd7b64465ff063ffc6568dba55d499c82bb36e635bbeb5fda6ce305457af9f1015213b53b4a4fa676055d88c0779120aba8be08d357b1 +MISC ChangeLog 1539 SHA256 0eab1df9eb71f2ec792f8d78a606179bace213ae67fb75d7d226036c75d03052 SHA512 ade71a1612abe8973afec5caf063f2006ccdff6ca89bcc7905c2646bba7e801a9bab8004824863027f1d1ae1e02eea0b9341519dd5b2c9814f23795c5a4bc76c WHIRLPOOL be14ff50f3305ed97c9fe0ab15a09d0522585c201cdec057ac7876b0274d3375c995478e4281204466d1e3947fbf0a8212821fca22e24d38f85403c722661a6b MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPnuoAACgkQcaHudmEf86puvwCfdabvAnKYSknFAEBADPDDRBhq -jskAnRe72b92/cBjgRHFABciTKkl3DSY -=6XXX +iEYEAREIAAYFAlRnRzAACgkQVWmRsqeSphMmpwCfZaXws5iPA8oP3TGomhZvzxCl +8GcAnjs7vL0dcFgQAjmv53LvpzzWqNEN +=ri+K -----END PGP SIGNATURE----- diff --git a/app-text/reed/reed-5.4.ebuild b/app-text/reed/reed-5.4.ebuild index 5ccebf5a1dd6..cda5cf901a81 100644 --- a/app-text/reed/reed-5.4.ebuild +++ b/app-text/reed/reed-5.4.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/reed/reed-5.4.ebuild,v 1.13 2014/08/10 18:31:27 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/reed/reed-5.4.ebuild,v 1.14 2014/11/15 12:29:35 jer Exp $ -EAPI=4 - -inherit toolchain-funcs +EAPI=5 +inherit eutils toolchain-funcs DESCRIPTION="This is a text pager (text file viewer), used to display etexts" # Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist. @@ -14,7 +13,6 @@ SRC_URI="http://www.sacredchao.net/software/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 x86" -IUSE="" DEPEND="sys-libs/ncurses" RDEPEND="${DEPEND}" @@ -22,13 +20,15 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS BUGS NEWS README ) src_prepare() { - sed -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \ - -e "s: wrap::" \ - -e "s:-s reed:reed:" -i Makefile.in || die + sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \ + -e 's: wrap::' \ + -e 's:-s reed:reed:' \ + -e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \ + -i Makefile.in || die rm wrap.1 #Collision with talkfilters, bug #247396 - tc-export CC + tc-export CC PKG_CONFIG } src_configure() { - ./configures --prefix=/usr || die "configures failed" + ./configures --prefix=/usr || die } |