Bump lesspipe

4 files changed, 17 insertions, 8 deletions

diff --git a/sys-apps/lesspipe/ChangeLog b/sys-apps/lesspipe/ChangeLog
index a761125e..6ac59ed9 100644
--- a/sys-apps/lesspipe/ChangeLog
+++ b/sys-apps/lesspipe/ChangeLog
@@ -2,7 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*lesspipe-1.72.ebuild (11 Nov 2012)
+*lsespipe-1.82 (24 Dec 2013)
+
+  24 Dec 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild.
+
+*lesspipe-1.72 (11 Nov 2012)
 
   11 Nov 2012; Martin Väth <martin@mvath.de>:
   New Ebuild from scratch
diff --git a/sys-apps/lesspipe/Manifest b/sys-apps/lesspipe/Manifest
index 4ebd0470..f0ea97af 100644
--- a/sys-apps/lesspipe/Manifest
+++ b/sys-apps/lesspipe/Manifest
@@ -1 +1 @@
-DIST lesspipe-1.72.tar.gz 105367 SHA256 d62b25fe73928f9454de373296325dfb2fa02e0718d33ad87c3b083e6e5ce5d4 SHA512 838ec55ea034a372710988dcd4257c77643059b2642c271653c1564716627344a5ea414a77829029488a14dd033b3e278d0b71dbbcb444b8d3d90e8358e6e7bd WHIRLPOOL 4db91df5d41df6b30d70e85d8a0967f3cbe46303b9435281081c1190f43a987720be8bb433a4802aff0555b88fe7c2b3c9ae13aed06287fe269674059071427c
+DIST lesspipe-1.82.tar.gz 112854 SHA256 3fd345b15d46cc8fb0fb1d625bf8d881b0637abc34d15df45243fd4e5a8f4241 SHA512 6dd5f5e00755b7284d0867eca6e9f815a2cee38dcba3fd632f29f420e6295e1a7505bab4b8461f5f88d75fc5495af97c5ebdc815d2d46850247e6289a181130d WHIRLPOOL b236a07d1867e50d01502014f12f93322d1d87aa46c630ad1b4393f129ed9f63f42e085ae8e1e6bb164ace06f19e407528af99d4e466b061e24ab38e38b39059
diff --git a/sys-apps/lesspipe/lesspipe-1.72.ebuild b/sys-apps/lesspipe/lesspipe-1.82.ebuild
index 0bf5b756..ceffaafc 100644
--- a/sys-apps/lesspipe/lesspipe-1.72.ebuild
+++ b/sys-apps/lesspipe/lesspipe-1.82.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="antiword cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff +html2text id3v2 image isoinfo libplist +links +lynx lzip mp3info ooffice p7zip pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m xlhtml"
+IUSE="antiword cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff +html2text id3v2 image isoinfo libplist +links +lynx lzip mp3info mp3info2 ooffice p7zip pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m xlhtml"
 
 htmlmode="( || ( html2text links lynx elinks w3m ) )"
 REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
@@ -70,7 +70,10 @@ RDEPEND="sys-apps/file
 	pdf? ( app-text/poppler )
 	id3v2? ( media-sound/id3v2 )
 	!id3v2? (
-		mp3info? ( media-sound/mp3info )
+		mp3info2? ( dev-perl/MP3-Tag )
+		!mp3info2? (
+			mp3info? ( media-sound/mp3info )
+		)
 	)
 	image? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )
 	isoinfo? ( || ( app-cdr/cdrtools app-cdr/dvdrtools app-cdr/cdrkit ) )
@@ -158,7 +161,7 @@ src_prepare() {
 	! use pstotext && use ghostscript; ModifyX 'ps2ascii'
 	ModifyU 'gpg'
 	use pdf; ModifyX 'pdftohtml' 'pdftotext'
-	Modify1 'id3v2' 'mp3info'
+	Modify1 'id3v2' 'mp3info2' 'mp3info'
 	use image; ModifyX 'identify'
 	ModifyU 'isoinfo'
 	ModifyN 'dpkg'
@@ -170,7 +173,7 @@ src_prepare() {
 }
 
 src_configure() {
-	./configure --fixed --prefix="${ED}/usr"
+	./configure --fixed --prefix=/usr
 }
 
 src_install() {
diff --git a/sys-apps/lesspipe/metadata.xml b/sys-apps/lesspipe/metadata.xml
index 1c27d76e..09af4d81 100644
--- a/sys-apps/lesspipe/metadata.xml
+++ b/sys-apps/lesspipe/metadata.xml
@@ -19,14 +19,15 @@
 		<flag name="gpg">Support gpg files</flag>
 		<flag name="groff">Support man and nroff files</flag>
 		<flag name="html2text">Support html files with app-text/html2text; this overrides links, lynx, elinks, w3m</flag>
-		<flag name="id3v2">Support mp3 files with media-sound/id3v2; this overrides mp3info</flag>
+		<flag name="id3v2">Support mp3 files with media-sound/id3v2; this overrides mp3info2, mp3info</flag>
 		<flag name="image">Support image/jpg files</flag>
 		<flag name="isoinfo">Support CD/DVD-iso files</flag>
 		<flag name="libplist">Support Apple Property List files</flag>
 		<flag name="links">Support html files with www-client/links; ignored if html2text is set; this overrides lynx, elinks, w3m</flag>
 		<flag name="lynx">Support html files with www-client/lynx; ignored if html2text or links is set; this overrides elinks, w3m</flag>
 		<flag name="lzip">Support lzip files</flag>
-		<flag name="mp3info">Support mp3 files with media-sound/mp3info; unused if id3v2 is set</flag>
+		<flag name="mp3info">Support mp3 files with media-sound/mp3info; unused if id3v2 or mp3info2 is set</flag>
+		<flag name="mp3info2">Support mp3 files with dev-perl/MP3-Tag (mp3info2); ignored if id3v2 is set; this overrides mp3info</flag>
 		<flag name="ooffice">Support OpenOffice files</flag>
 		<flag name="p7zip">Support p7zip files</flag>
 		<flag name="pdf">Support pdf files</flag>