Tidy up. Removed ${A} (violates Gentoo Policy), reported in #28161.

4 files changed, 70 insertions, 31 deletions

diff --git a/app-i18n/jless-iso254/ChangeLog b/app-i18n/jless-iso254/ChangeLog
index cc6ceff74424..12c1c6a04ec5 100644
--- a/app-i18n/jless-iso254/ChangeLog
+++ b/app-i18n/jless-iso254/ChangeLog
@@ -1,9 +1,21 @@
 # ChangeLog for app-i18n/jless-iso254
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/jless-iso254/ChangeLog,v 1.4 2003/07/30 17:33:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jless-iso254/ChangeLog,v 1.5 2003/09/08 11:56:39 usata Exp $
 
 *jless-iso254-358 (09 Jul 2002)
 
+  08 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> jless-iso254-358.ebuild,
+  metadata.xml:
+  Changed DESCRIPTION (jless is not Japanese less but Jam less).
+  Removed ${A} redefinition (reported in Bug #28161). Use mirror://gnu/
+  instead of GNU master site. Added original less HOMEPAGE. Changed
+  LICENSE because Jam less is distributed under BSD license. Read
+  ${EDITOR} from /etc/profile rather than hardcode it to /usr/bin/nano.
+  Install lesspipe.sh as jlesspipe.sh and make a symlink to lesspipe.sh
+  if original less is not installed (try epm -qf /usr/bin/lesspipe.sh !).
+  Added pkg_postinst() to make sure /usr/bin/lesspipe.sh is present.
+  Added <longdescription> to metadata.xml.
+
   31 Jul 2003; Mamoru KOMACHI <usata@gentoo.org> jless-iso254-358.ebuild:
   Added ~alpha, ~sparc and ~ppc keywords
 
diff --git a/app-i18n/jless-iso254/Manifest b/app-i18n/jless-iso254/Manifest
index 3178b9afa87b..0e7102675e9a 100644
--- a/app-i18n/jless-iso254/Manifest
+++ b/app-i18n/jless-iso254/Manifest
@@ -1,5 +1,5 @@
-MD5 fdcacd8d321898391898b3a2e34b5089 ChangeLog 555
-MD5 5261e6648ed4f1df4d1d66c0b9716527 jless-iso254-358.ebuild 1230
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 a4c4d7192f32cf981ab123f2191746af ChangeLog 1247
+MD5 b96c3dc8bbbccd1b97f602b053741070 jless-iso254-358.ebuild 1387
+MD5 26462c324a30c663f0721d42a1df048e metadata.xml 721
 MD5 09f1d81c202482a5575990f55b29f0bf files/digest-jless-iso254-358 128
 MD5 0cc555c44c02b9b457e98ed39a63f1a2 files/lesspipe.sh-r1 1429
diff --git a/app-i18n/jless-iso254/jless-iso254-358.ebuild b/app-i18n/jless-iso254/jless-iso254-358.ebuild
index 49e005e58963..922319ef84cd 100644
--- a/app-i18n/jless-iso254/jless-iso254-358.ebuild
+++ b/app-i18n/jless-iso254/jless-iso254-358.ebuild
@@ -1,49 +1,64 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/jless-iso254/jless-iso254-358.ebuild,v 1.6 2003/07/30 17:33:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jless-iso254/jless-iso254-358.ebuild,v 1.7 2003/09/08 11:56:39 usata Exp $
 
+inherit eutils
+
+IUSE=""
+
+LESS_P="less-${PV}"
+
+DESCRIPTION="Jam less is an enhancement of less which supports multibyte character"
+SRC_URI="mirror://gnu/less/${LESS_P}.tar.gz
+	http://www.io.com/~kazushi/less/${LESS_P}-iso254.patch.gz"
+HOMEPAGE="http://www.flash.net/~marknu/less/
+	http://www.io.com/~kazushi/less/"
+
+LICENSE="BSD"
+SLOT="0"
 KEYWORDS="x86 ~alpha ~sparc ~ppc"
-A=less-${PV}.tar.gz
-S=${WORKDIR}/less-${PV}
-DESCRIPTION="Japanese enabled pager -- less-iso254"
 
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/less/less-${PV}.tar.gz
-	http://www.io.com/~kazushi/less/less-358-iso254.patch.gz"
-HOMEPAGE="http://www.io.com/~kazushi/less/"
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
-LICENSE="as-is"
-SLOT="0"
 
+S="${WORKDIR}/${LESS_P}"
 
 src_unpack() {
-	unpack ${A}
+
+	unpack ${LESS_P}.tar.gz
 	cd ${S}
-	zcat ${DISTDIR}/less-${PV}-iso254.patch | \
-		patch -s -p1 || die "Patch failed"
+	epatch ${DISTDIR}/${LESS_P}-iso254.patch.gz
 }
 
 src_compile() {
-	cd ${S}
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--without-cs-regex \
+	local editor=$(. /etc/profile 2>/dev/null ; echo $EDITOR)
+
+	econf --without-cs-regex \
+		--with-regex=auto \
 		--enable-msb \
 		--enable-jisx0213 \
-		--with-regex=auto \
-		--with-editor=/usr/bin/nano || die "Configure failed"
+		--with-editor=${editor} || die
 
-	emake || die "Make failed"
+	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr					\
-	     binprefix=j					\
-	     manprefix=j install			||	\
-	     die "Install failed"
-	dodoc COPYING LICENSE NEWS README README.iso README.iso.jp
-	exeinto /usr/bin
-	newexe ${FILESDIR}/lesspipe.sh-r1 lesspipe.sh
+
+	einstall binprefix=j manprefix=j || die
+
+	newbin ${FILESDIR}/lesspipe.sh-r1 jlesspipe.sh
+	if [ ! -f /usr/bin/lesspipe.sh ] ; then
+		dosym /usr/bin/jlesspipe.sh /usr/bin/lesspipe.sh
+	fi
+
+	dodoc COPYING LICENSE NEWS README*
+}
+
+pkg_postinst() {
+
+	# for backward compatibility
+	if [ ! -f /usr/bin/lesspipe.sh ] ; then
+		ln -s /usr/bin/jlesspipe.sh /usr/bin/lesspipe.sh
+	fi
 }
diff --git a/app-i18n/jless-iso254/metadata.xml b/app-i18n/jless-iso254/metadata.xml
index 2d5852c16c60..92a3d49cccb1 100644
--- a/app-i18n/jless-iso254/metadata.xml
+++ b/app-i18n/jless-iso254/metadata.xml
@@ -2,4 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>cjk</herd>
+<longdescription>
+Quote from Jam less homepage (http://www.io.com/~kazushi/less/):
+&quot;Less is one of the best text viewer. It is a successor of more. It
+allows you to scroll forward, scroll backward, search, etc through
+multiple text files.
+
+However, it doesn't support multi bytes characters. So, I made a patch
+to enhance it in order to view texts with multi character sets using
+using ISO 2022 code extention techniques. And I also support some code
+conversion among Japanese encoding schemes, JIS X 0208, JIS X 0213,
+SJIS, and UJIS.&quot;
+</longdescription>
 </pkgmetadata>