Fix building against sys-libs/ncurses[tinfo] (bug #526908). Fix DPEND typo. Clean up patch.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 55 insertions, 24 deletions

diff --git a/app-editors/shed/ChangeLog b/app-editors/shed/ChangeLog
index 082e5c34f57b..fc53d1446651 100644
--- a/app-editors/shed/ChangeLog
+++ b/app-editors/shed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/shed
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/ChangeLog,v 1.25 2012/08/22 00:19:16 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/ChangeLog,v 1.26 2014/10/26 10:39:47 jer Exp $
+
+  26 Oct 2014; Jeroen Roovers <jer@gentoo.org> shed-1.15.ebuild,
+  +files/shed-1.15-cflags.patch, files/shed-1.15-interix.patch,
+  +files/shed-1.15-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #526908). Fix DPEND typo.
+  Clean up patch.
 
   22 Aug 2012; Anthony G. Basile <blueness@gentoo.org> shed-1.15.ebuild:
   Keyword ~arm, bug #431922
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
index c52bccf45b0c..7e1e62188cd8 100644
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX shed-1.15-interix.patch 433 SHA256 1ac91b728af3f14423ffbb6933d319ce3cde26e253bc8fb419685c759e1321b6 SHA512 2daaf4e43b5f141d9ab0b9eb2990d74ad535cd051e61758b1b9f52e3ed1d9f2efc470dadffdea09aa21e1e4445c5d71d6545c37b4112475d438b11c06446fbe5 WHIRLPOOL 081040596ec8b1849c26ca7e974bcd4ad9d8b1917b231932d4ea50547b28fc89473862eac4aff2e6c0bd7c2801cfd680ae655257ae72c8517c099daabb0a7513
+AUX shed-1.15-cflags.patch 249 SHA256 4256ec96ce3e5623cd108de267ad38afd8413d2683cc0010e5a212bd5228b0f1 SHA512 9f6f025c5fc5126357e8b763706d2a0eb53700963b0d8779f057683fc95773753eced99b26a9120b122f50c8b23db6c6bf79cb973023b11e594313c8fcf92cdf WHIRLPOOL da72d1f123cede47bafe89222afdc2415160019a295881cac1e524de364f8b2e1478a58b1b6a0052db9d9457dcad700613df0deec71ee7c5636978b021cb8d32
+AUX shed-1.15-interix.patch 312 SHA256 79cf84d6f9777cff31a942540eaaa1d8d6bfa72ce6f2494592586cabcd5d5699 SHA512 f511f670e1c4054a48481a28890ed51da263a7a5e5c5dd9693392f8f3b3ada9631e9d1219f4344c6237ac21f6bc2bba94c14a44885ed77de2866d548d3eda658 WHIRLPOOL 7f29bb5cbf325d83c60e8aa3c7e60673477d29011e9182c1f658aa88e736c444717414b69050040888ace26873081029333f4f2749f81224a1508954d0db6412
+AUX shed-1.15-tinfo.patch 355 SHA256 1f749efd26eb6b5ca162de25238c676e603cc20afa72f40b33314dd6288371b8 SHA512 fab71c3e99138f7cc4844964bbc40e95c90055612e6d34ff59c72b505b2c12c6244c4a25091de283f4615475652c202a4404273c0718b73b9f928c4bf0a74710 WHIRLPOOL ca0dfecce130f3ef483d1428a219f522362fa2a6e48422020866e68c05144201ed593ed7596c9a38d52b753bc29c6aa85b8dfca72ac0acf4dd57816445d3fb14
 DIST shed-1.12.tar.gz 57934 SHA256 9645c991a2c155e8365d86b927807602156ba502bd0d65c050f60343aa5aa730 SHA512 f668245478b88e74911a5f6bc13629b1be9412056bfb42860554979904451b20cb468ae7a9b2daa8bea83d7f78d3d0c016170767dd80f0a93ba140a51ad02097 WHIRLPOOL c39d064b0a1eb7f43d9538837e07de970e926887a940a82c3f879a6b142ff12f625fcc56689c028f83c673ad644d248210c9498e32f6a8f5d08669b21790713f
 DIST shed-1.13.tar.gz 78699 SHA256 d0a1aa6c30b907945608d478949a00ac2ef1b3f1783dbe391816665dc9cff423 SHA512 abea90115820c50bba140a486d74e28cd20704905bb868aa75b94a346faf8d1a0e0739f9558131cff9c5250ac9ef2505cc375f2bdf24c75b6ff464ba767c1832 WHIRLPOOL 950c36c5ffdedba1f3edc64b7371c5a68a0e6664f8a695b66f42c2ec2d5d1618aad39c7856734b9f922d4224199f0bfc4c750c7886650c2792c71b8c6389e85c
 DIST shed-1.15.tar.gz 87777 SHA256 5bde9f146704ba552293b658a2e8e05acb0a14a1348925b19a296663539917c7 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78 WHIRLPOOL 8588f739370309e54ac04e0a686e24adf3c236011ee57ca79846c63fae7038a934992ae0ab918eb4acab2ec1577d5c3aceaaded861620c2b75fbb2b1ee333058
 EBUILD shed-1.12.ebuild 501 SHA256 9ebcf499bf3e83b820f0e3853df897765f1643e5e3539500cc6727715b63e48d SHA512 cb1869dc6bef2693b4a850e718a3cdc65459e8cd83ba3c5562e96c58911d79fadf405e9b2ebb33e457b106e6de6b63746a87bd67086989339eb4129996518dbc WHIRLPOOL fa572637317f22400d405266dfdfaa6a67aff54c9dedcd3c0ee070f182b1a7f896ded24fd3660ec7e7a1072c7accf43675b33652d50186ea4e44bca5c4cc5de2
 EBUILD shed-1.13.ebuild 502 SHA256 b3b4f19551c245b90d1c44528b8346d61a67c435167db19354901205685c9de6 SHA512 47619c2911c0a1f56fe7eda4cf041ae9953238ff80fc3071a182152791a4ceadc9cfb3e34bb289df597944598897e21d05600b8edcd1fa06e8bbde302672905a WHIRLPOOL b741fe6bbb8ceee6c11417ad7697387e21e190d8c30e6066eb24c8696f93414919b30418b50ecf390d0ce3f91f00cba4d0853c289fc7ea28e15c16b82a6af154
-EBUILD shed-1.15.ebuild 635 SHA256 855f79f9ae916d3e67b5417334440ef4507ec2b2ee5d6cf2bfda7304bbc207a5 SHA512 d16f94baaa9b2e5a2b0b03885b45cc9e11a45cd0d9cb87d939eb08104b076b8179866179cee20c6c93a186b88c4cde5bdb7d9520866c23a29f004f13bcaa7d9e WHIRLPOOL 4aa63795500609aa706e6ed67710b35dc5469d1aa7032adbf5c2dc2a3fb38ab20caa6e78986253554e4ebd4635f8539f54e1508c7d1193a69c2d10b346858889
-MISC ChangeLog 2684 SHA256 9545d7a84eadf1a49b8e3f687aee2ef01aa97f081bc3602321fcf56d9747fe9f SHA512 1252c25e278b35fc94b5804a198f9098686eea259a9852e4dd861549ebd32f4347d95f3bccaa16ca9835b59546686aef11a2bf67092a270ce8c414037cf4bb3e WHIRLPOOL 9c246e9830adb4880a6c6de28481359d62af0d708f89d2e20860f109c300273f700d54e00cdc4bc3275ab7db3da2de99cc5e1ad57f832035c2ad6fc4e2da5c43
+EBUILD shed-1.15.ebuild 692 SHA256 193b90ca2629aeff0ad7c46cc7906fffaac4f81e7b7794b84afe303731c17895 SHA512 14908993b00c27afa2aa22ecde546d5049d813cc0773d4287180dcdc6ce435e7911dc6e83dca46e9cbb1cb5908887905918ac9dca50d0f3c24a869a3f2d94420 WHIRLPOOL adc3152394e2d3e02e83b84ca41d53414b23a2d8093488dd607ee37af0a437ccc827b958747224a74323dad8bee21828d1fc4df61aeb0bbb069dba209b591550
+MISC ChangeLog 2937 SHA256 c18a14d0e698ea304350b84f39aab470feb34686e371bec864752993530d3b00 SHA512 f0f21ce4edaec9b7b9888aabe1bd94346d5332f3f9b6550bb623fb05d5ec14b840157ccb23408cd7ef751507490873ae581ca2d929ca1decd41accc2f8ab0619 WHIRLPOOL edade729d58bd3f9e9031a86f663d598357437eda825ebd0fb02b37b145c8e7ddcfe34901bf8fc76e658a81220b731d721bd8057cf6fc1661a940608eec4bad1
 MISC metadata.xml 207 SHA256 131271f902267c3eb067a7b0316b1e2598d5cc32a4528edb37d50ea2f4b262e0 SHA512 5a94c029f35e9fe05a2ce6678db9a67aa9c0f78ed03b48e267b53db983c8bdc8f8cf2d5001e3c4074ddbe04526547f38576981f660d165c1a7908fa5eeaa20c6 WHIRLPOOL 8928372826be281072bdd0c064b1da6f8f10c220972343090083285052fd64608239840ec7ba9a313c7c5cf3309619fdd023a6fa49fbaf97311b5b6333e93b5a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlA0JXsACgkQl5yvQNBFVTVDOQCaA+8wr6T3zpwCO/fr0qilXFJa
-S6YAn0eZH0hBfkx5CtBwQ/hxSQS2kj2l
-=1nEp
+iEYEAREIAAYFAlRMz3QACgkQVWmRsqeSphNikACfZ/F4CrpNKqK8kzHv6VyoDmju
+Lr8An1tnCJO0B6M299/oK7WvsFVexc7m
+=tQaQ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/shed/files/shed-1.15-cflags.patch b/app-editors/shed/files/shed-1.15-cflags.patch
new file mode 100644
index 000000000000..2b675f7449f7
--- /dev/null
+++ b/app-editors/shed/files/shed-1.15-cflags.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,7 @@
+ AM_INIT_AUTOMAKE(shed,1.15)
+ AC_PROG_CC
+ AC_PROG_INSTALL
+-CFLAGS="-Wall"
++CFLAGS="$CFLAGS -Wall"
+ AC_SUBST(CFLAGS)
+ 
+ AC_ARG_ENABLE(debug,   [  --enable-debug          gcc -g],enable_debug=yes)
diff --git a/app-editors/shed/files/shed-1.15-interix.patch b/app-editors/shed/files/shed-1.15-interix.patch
index 16c310d91cd1..d496795477b4 100644
--- a/app-editors/shed/files/shed-1.15-interix.patch
+++ b/app-editors/shed/files/shed-1.15-interix.patch
@@ -1,7 +1,6 @@
 http://sourceforge.net/tracker/?func=detail&aid=3554634&group_id=21862&atid=374571
-diff -ru shed-1.13.orig/shed.c shed-1.13/shed.c
---- shed-1.13.orig/shed.c	2008-04-03 15:21:53 +0200
-+++ shed-1.13/shed.c	2008-04-03 15:23:05 +0200
+--- a/shed.c
++++ b/shed.c
 @@ -31,6 +31,10 @@
  #include <ctype.h>     /* tolower    */
  #include <unistd.h>    /* dup, dup2  */
diff --git a/app-editors/shed/files/shed-1.15-tinfo.patch b/app-editors/shed/files/shed-1.15-tinfo.patch
new file mode 100644
index 000000000000..d1a406521c0f
--- /dev/null
+++ b/app-editors/shed/files/shed-1.15-tinfo.patch
@@ -0,0 +1,12 @@
+--- a/configure.in
++++ b/configure.in
+@@ -41,8 +41,7 @@
+ fi
+ 
+ ERR="Required package missing!"
+-AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([$ERR]))
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],AC_MSG_ERROR([$ERR]))
+ AC_CHECK_HEADER(getopt.h,:,AC_MSG_ERROR([$ERR]))
+-AC_CHECK_LIB(ncurses,initscr)
+ AC_CHECK_LIB(m,pow)
+ AC_OUTPUT(Makefile)
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index a0f12ddc4a64..5c8bc3d79a8c 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.3 2012/08/22 00:19:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.4 2014/10/26 10:39:47 jer Exp $
 
-EAPI="4"
-
-inherit eutils
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Simple Hex EDitor"
 HOMEPAGE="http://shed.sourceforge.net/"
@@ -13,15 +12,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="sys-libs/ncurses"
-DPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-interix.patch
-}
-
-src_compile() {
-	emake AM_CFLAGS="${CFLAGS}"
+	epatch \
+		"${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-interix.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
 }