Fix lpe to work with slang 2.1.3.

Package-Manager: portage-2.1.4.1

4 files changed, 10 insertions, 44 deletions

diff --git a/app-editors/lpe/ChangeLog b/app-editors/lpe/ChangeLog
index 440474f01bf6..3335f91a2f7d 100644
--- a/app-editors/lpe/ChangeLog
+++ b/app-editors/lpe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/lpe
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/ChangeLog,v 1.14 2008/01/25 19:23:19 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/ChangeLog,v 1.15 2008/02/09 05:43:51 drac Exp $
+
+  09 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  -files/lpe-1.2.6.13-slang-2.patch, lpe-1.2.6.13.ebuild:
+  Fix lpe to work with slang 2.1.3.
 
   25 Jan 2008; Samuli Suominen <drac@gentoo.org> -lpe-1.2.6.ebuild:
   Remove unused version.
diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
index 2723766c126e..65698266b7c9 100644
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@@ -1,8 +1,7 @@
 AUX lpe-1.2.6.12-slang.patch 800 RMD160 b11ee52ea1ff461a011b4cd4396f241c7c76d1ba SHA1 36023efd45c1bc3453028e1a56019587115b6925 SHA256 68c74d5258620054e6cd16e6b6c4635f48cbef4b372f2d6e8924b24ed532befc
-AUX lpe-1.2.6.13-slang-2.patch 1198 RMD160 d23c681ed2d6a6d5c982538c2ec777fe7ef979b1 SHA1 f699875d4e43bdb2abf9cbba264f896968cde64b SHA256 f03f1db1d8a221af5831a66842ae20156abb0a5bc51867da5a47de16bbe89647
 DIST lpe_1.2.6.12.tar.gz 540141 RMD160 07a826a60db42842ea1cd885d2a172f0cf0c4736 SHA1 d35ad819812f03eb1e697bed088cc6bb6aa3ebe3 SHA256 7027168a449c4be272f4d4d5904198c0a9edb1d19e33824089812b4f8f6239bf
 DIST lpe_1.2.6.13-0.1.tar.gz 600523 RMD160 7439e666e4927c686ba654ded2e61da47ec22944 SHA1 66c2d51ce35095dc32f1b3f3c1d57392371ae993 SHA256 7828147e8b8bcf518e6d7f2241b480fe3bbaa1285d3c7c74b8c7160222d76816
 EBUILD lpe-1.2.6.12.ebuild 962 RMD160 705cfddb18d56ce522cbd2c252115403db36dada SHA1 eceb3f9ac52801b9613cfa7183a4abd731c4e177 SHA256 537bd2ac4f7d8dc9837f4ab1ad12fbf4f7b81451f5facb20027e25f2e1e37e9d
-EBUILD lpe-1.2.6.13.ebuild 1119 RMD160 b0b3019531d3e5f544e958da51b20ed4ac17c580 SHA1 0c128dbf7e0d15ff97f41816be00d133b541bba5 SHA256 343ca08710754b7067459f0f5f5cf1b0daf2b9d96f070c63264f4ccf1b6bf09d
-MISC ChangeLog 1578 RMD160 f3e7f7d5f4ab0090f83e28b3078ba5b997330fb7 SHA1 ed30d78957a26768bb9e65cae9005582017033c4 SHA256 360ca42a60337bb79716f503f6870b5c1e661da45f3677e626d34e094648da83
+EBUILD lpe-1.2.6.13.ebuild 943 RMD160 9f95e01fef174952468a25ef0768c41a0d035b4b SHA1 beb5ba0075f6568ebb42239b3c6adc8b8e3129a7 SHA256 1b09bcfb5e9fc73ebee4ce4f1e9a3d5077eea4314195de6033b103d4f7dd7aea
+MISC ChangeLog 1722 RMD160 019c0ae7445dfe26cf075ac39dfd2119f641ee11 SHA1 794d483494e0fcdb3b4e51a62572f62d17c7c5d3 SHA256 a27cb291f8959c2aaf749d779977e40919b585d916cd35ef225db5a097451359
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/app-editors/lpe/files/lpe-1.2.6.13-slang-2.patch b/app-editors/lpe/files/lpe-1.2.6.13-slang-2.patch
deleted file mode 100644
index 6d79ab69a2d0..000000000000
--- a/app-editors/lpe/files/lpe-1.2.6.13-slang-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur lpe-1.2.6.13.orig/configure.in lpe-1.2.6.13/configure.in
---- lpe-1.2.6.13.orig/configure.in	2005-06-20 07:20:31.000000000 +0300
-+++ lpe-1.2.6.13/configure.in	2008-01-24 13:33:36.000000000 +0200
-@@ -106,11 +106,11 @@
- dnl AC_MSG_WARN("$PACKAGE depends on dynamic libraries.")
- ])])])
- AC_SUBST(DL_LIB)
--AC_CHECK_LIB(slang,SLang_init_tty,[SLANG_LIB="-lslang"],[
-+AC_CHECK_LIB(slang-2,SLang_init_tty,[SLANG_LIB="-lslang-2"],[
- dnl reset the cache variable so configure will even bother to check -ltermcap
- unset ac_cv_lib_slang_SLang_init_tty
--AC_CHECK_LIB(slang,SLang_init_tty,[SLANG_LIB="-lslang -ltermcap"],[
--AC_MSG_ERROR([no slang library found.  $PACKAGE depends on SLang.])
-+AC_CHECK_LIB(slang-2,SLang_init_tty,[SLANG_LIB="-lslang-2 -ltermcap"],[
-+AC_MSG_ERROR([no slang-2 library found.  $PACKAGE depends on SLang.])
- ,-ltermcap])])
- AC_SUBST(SLANG_LIB)
- 
-@@ -144,8 +144,8 @@
- AC_CHECK_HEADERS(fcntl.h)
- AC_CHECK_HEADER(slang.h,
-  [SLANG_H=slang.h],
-- [AC_CHECK_HEADER(slang/slang.h,
--  [SLANG_H=slang/slang.h],
-+ [AC_CHECK_HEADER(slang-2/slang.h,
-+  [SLANG_H=slang-2/slang.h],
-   [AC_MSG_ERROR([slang.h is needed to compile $PACKAGE])])])
- AC_DEFINE_UNQUOTED(SLANG_H,"${SLANG_H}")
- 
diff --git a/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild
index 0e3cbfb30f96..ed49e3febe19 100644
--- a/app-editors/lpe/lpe-1.2.6.13.ebuild
+++ b/app-editors/lpe/lpe-1.2.6.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/lpe-1.2.6.13.ebuild,v 1.1 2008/01/24 11:49:19 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/lpe-1.2.6.13.ebuild,v 1.2 2008/02/09 05:43:51 drac Exp $
 
-inherit autotools eutils multilib
+inherit multilib
 
 DESCRIPTION="a lightweight programmers editor"
 HOMEPAGE="http://packages.qa.debian.org/l/lpe.html"
@@ -13,17 +13,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="nls"
 
-RDEPEND=">=sys-libs/slang-2"
+RDEPEND=">=sys-libs/slang-2.1.3"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-slang-2.patch
-	eautoconf
-}
-
 src_compile() {
 	econf $(use_enable nls)
 	emake || die "emake failed."
@@ -38,6 +31,5 @@ src_install() {
 		docdir="${D}/usr/share/doc/${PF}" \
 		exdir="${D}/usr/share/doc/${PF}/examples" \
 		install || die "emake install failed."
-	dodoc AUTHORS BUGS Changelog CUSTOMIZE IDEAS MODES NEWS README TODO
 	prepalldocs
 }