Fix bug #293654. Add myself as maintainer.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

5 files changed, 129 insertions, 7 deletions

diff --git a/media-gfx/aview/ChangeLog b/media-gfx/aview/ChangeLog
index ffa9f779f3b0..d5214dd383ab 100644
--- a/media-gfx/aview/ChangeLog
+++ b/media-gfx/aview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/aview
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/ChangeLog,v 1.15 2009/05/29 14:08:56 rbu Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/ChangeLog,v 1.16 2011/02/23 17:56:58 signals Exp $
+
+*aview-1.3.0_rc1-r2 (23 Feb 2011)
+
+  23 Feb 2011; Kevin McCarthy <signals@gentoo.org> +aview-1.3.0_rc1-r2.ebuild,
+  +files/aview-1.3.0_rc1-asciiview.patch:
+  Fixed multiple filename bug and keyboard input problem. (Bug #293654)
 
   29 May 2009; Robert Buchholz <rbu@gentoo.org> -aview-1.3.0_rc1.ebuild:
   Remove ebuild that is vulnerable to GLSA 200812-14, bug #271762.
diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest
index c38c5e0c51f6..52bcd4004097 100644
--- a/media-gfx/aview/Manifest
+++ b/media-gfx/aview/Manifest
@@ -1,7 +1,9 @@
+AUX aview-1.3.0_rc1-asciiview.patch 1936 RMD160 8ac95594fc287caeef4f26cad27895bdf82b475c SHA1 29e231bd8d8c27f2d8d17ba6597e1055c8baf832 SHA256 b0743c2ec3f374783d83e0e713fba3201f96f7543e8d70e989ce84bb6ae581c7
 AUX aview-1.3.0_rc1-filename-spaces.patch 1393 RMD160 c1fbf423a2964b2f0b2fabd7c5d5e1ea07e56db0 SHA1 6e2da98efcd5d095ae99df672a58c01e1fcc1dd0 SHA256 f2db2767fdb8340c2284cc56f00dfabdc084aae5cc36048a8859f28bf42491a8
 AUX aview-1.3.0_rc1-includes.patch 281 RMD160 bdd0efc495af15a4d593dc75957fef50a93a98e0 SHA1 18eb5be7315a3234934d4c99d73e608dfed665e4 SHA256 f4f9def04b601ce2e987f3295187c2d4e139408e14424a19fce78d75c919cc5c
 AUX aview-1.3.0_rc1-tmp_creation.patch 1142 RMD160 72661135c184fd117771a0dfdfbf16783ef4d3f6 SHA1 4b61e8dc10fdbea060ae9e602120d8719c08ec57 SHA256 3d7c40f5ba8369243953206c9e2718277ec5acd091b2898a9fdf45f091e8eb15
 DIST aview-1.3.0rc1.tar.gz 54317 RMD160 f57808dfb9efc36af3b4107bfd48ae875d709cd0 SHA1 d757ff9f62e6ce4d926c03ae4f4096d9fcf353fc SHA256 42d61c4194e8b9b69a881fdde698c83cb27d7eda59e08b300e73aaa34474ec99
 EBUILD aview-1.3.0_rc1-r1.ebuild 819 RMD160 2f72f787c99bf486c42f4a818b659c4c87f5ad0f SHA1 6fafedd44a1992f409a190fb8e507bf88322785e SHA256 2c04995b710e512c7d5bf71d0d4a2dfd46e32c7cb271807a7c79c219bed7ede1
-MISC ChangeLog 2415 RMD160 50308199af5f5386cde0fe804de5e27087e2eadd SHA1 3faac95e57c2a4ce71a3e76a1b0b55dbbc45d063 SHA256 393bb22181cb5d05b3aa93da28ddbc8801227696fec54f35b2dcffe1ed2dbc00
-MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+EBUILD aview-1.3.0_rc1-r2.ebuild 781 RMD160 2635e31032a6e7f8c187906831bb5f5a10566345 SHA1 46d6ccf69dd28fc88908acaf0b096e9a39a98729 SHA256 85a0822926b449fb26f0c7023f28f70345b2e75efa6f5c1da9942043faf0f15e
+MISC ChangeLog 2648 RMD160 c8b6f0d12451db48c68fc9fff9fb1c0f9277ae54 SHA1 4083915426dea8db44803d0f3f6b979f4270bedb SHA256 f7776c42fd92257fd3ed329ef6628fd57c4327ea565d49ff3f827faa604d4a1f
+MISC metadata.xml 261 RMD160 a0fe08baffb5c6d358618c81e7ea168b1a6db991 SHA1 f38fdd2b5a13d66145e3bc227ff4251cb5366883 SHA256 b5458f72eb37d3bb24f0d2060bb2259ce637cf7dedf0382a29721f563cc10c10
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r2.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r2.ebuild
new file mode 100644
index 000000000000..04e8d65a42bc
--- /dev/null
+++ b/media-gfx/aview/aview-1.3.0_rc1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/aview-1.3.0_rc1-r2.ebuild,v 1.1 2011/02/23 17:56:58 signals Exp $
+
+inherit base
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P/rc*/}
+DESCRIPTION="An ASCII Image Viewer"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+HOMEPAGE="http://aa-project.sourceforge.net/aview/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/aalib-1.4_rc4"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-asciiview.patch
+	"${FILESDIR}"/${P}-includes.patch
+)
+
+src_compile() {
+	econf || die
+	make aview || die
+}
+
+src_install() {
+	into /usr
+	dobin aview asciiview
+
+	doman *.1
+	dodoc ANNOUNCE ChangeLog README TODO
+}
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
new file mode 100644
index 000000000000..6d71bbb967b1
--- /dev/null
+++ b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
@@ -0,0 +1,76 @@
+Support spaces in filenames (bug #39207) based on a patch from
+kyberneticist AT yahoo DOT com with additional fixes to address bug
+#293654 by Kevin McCarthy <signals@gentoo.org>
+
+Fix insecure temporary file permissions (bug #235808) based on a patch from
+Robert Buchholz <rbu@gentoo.org>
+
+Fix ignored interactive keyboard commands when aview is called from the
+asciiview script (bug #293654) by Kevin McCarthy <signals@gentoo.org>
+
+Rollup patch created by Kevin McCarthy <signals@gentoo.org>
+
+--- asciiview
++++ asciiview
+@@ -3,13 +3,13 @@
+ clear()
+ {
+   kill $! 2>/dev/null
+-  rm -f /tmp/aview$$.pgm 2>/dev/null
++  rm -rf $tmpdir 2>/dev/null
+ }
+ myconvert()
+ {
+-   if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then
++   if anytopnm "$1" >"$2" 2>/dev/null ; then
+      exit
+-   elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then
++   elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then
+      exit
+    fi
+    echo "Failed to convert file format to PNM by both convert and anytopnm" >&2
+@@ -44,27 +44,34 @@
+       options="$options $1"
+       shift
+       ;;
+-    *) 
+-      filenames="$filenames $1"
++    *)
++      if [ "$filenames" = "" ]
++      then
++        filenames=$1   #avoid leading null
++      else
++        filenames=$(echo -e "$filenames\n$1")
++      fi
+       shift
+       ;;
+   esac
+ done
+ trap clear 0
+-mkfifo /tmp/aview$$.pgm
+-outfile=/tmp/aview$$.pgm
+-for name in $filenames ; do
+-if test -r $name ; then
+-case $name in
++tmpdir=`mktemp -t -d`
++outfile=$tmpdir/aview.pgm
++mkfifo $outfile
++exec 3<&0
++echo "$filenames" | while read name; do
++if test -r "$name" ; then
++case "$name" in
+ *.fli | *.lfc | *.flic )
+   PATH="$PATH:."
+-  aaflip $options $name
++  aaflip $options "$name"
+   ;;
+ *)
+-  myconvert $name >/tmp/aview$$.pgm &
++  myconvert "$name" "$outfile" >"$outfile" &
+   pid=$!
+   PATH="$PATH:."
+-  aview  $options /tmp/aview$$.pgm
++  aview  $options $outfile <&3
+   kill $pid 2>/dev/null
+ esac
+ else
diff --git a/media-gfx/aview/metadata.xml b/media-gfx/aview/metadata.xml
index 54494c4bb860..ee209a571253 100644
--- a/media-gfx/aview/metadata.xml
+++ b/media-gfx/aview/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>signals@gentoo.org</email>
+    <name>Kevin McCarthy</name>
+  </maintainer>
 </pkgmetadata>