Version bump wrt #300537 by Jeroen Roovers. Fix automagic libXinerama depend wrt #285733 by Alexis Ballier. Use .xpm instead of .xbm for icon format to comply with f.d.o standard.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 122 insertions, 152 deletions

diff --git a/app-text/gv/ChangeLog b/app-text/gv/ChangeLog
index 569cf9153387..51bd7ab5c155 100644
--- a/app-text/gv/ChangeLog
+++ b/app-text/gv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/gv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.79 2009/12/26 17:31:42 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/ChangeLog,v 1.80 2010/06/12 22:04:45 ssuominen Exp $
+
+*gv-3.7.1 (12 Jun 2010)
+
+  12 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +gv-3.7.1.ebuild,
+  +files/gv_icon.xpm:
+  Version bump wrt #300537 by Jeroen Roovers. Fix automagic libXinerama
+  depend wrt #285733 by Alexis Ballier. Use .xpm instead of .xbm for icon
+  format to comply with f.d.o standard.
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> gv-3.6.3.ebuild,
   gv-3.6.4.ebuild, gv-3.6.6.ebuild, gv-3.6.7.ebuild:
diff --git a/app-text/gv/files/gv_icon.xpm b/app-text/gv/files/gv_icon.xpm
new file mode 100644
index 000000000000..a4a8fb4693be
--- /dev/null
+++ b/app-text/gv/files/gv_icon.xpm
@@ -0,0 +1,58 @@
+/* XPM */
+static char *gv_icon[] = {
+/* columns rows colors chars-per-pixel */
+"50 50 2 1",
+"  c #FFFFFF",
+". c #000000",
+/* pixels */
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . .   .   . .     .   .   . . . . . . .",
+". . . . . . .  .   .  .  . .       .    . . . . . ",
+" . . . .    .     .            .       . .   . . .",
+". . . . . . . . .            .     . .  . . . . . ",
+" . . . . .    .                        .   . . . .",
+". . . . .   .        ......     .     . .   . . . ",
+" . . .   .    .     ..    ...     . .      . . . .",
+". . .  .   .       ..       ..          . . . . . ",
+" . . .    .  .    ..         .  .  . .  .  . . . .",
+". . . . .         ..          .             . . . ",
+" . . .    . .     ..          .   .    .   . . . .",
+". . .  .       .  ..         ..           . . . . ",
+" . . .            ...       ..        .  . . . . .",
+". . . .  ....      ..      ..             . . . . ",
+" . . .   .. ..     ...     .      ....     . . . .",
+". . . . ...  .      ..     .     ..  ..   . . . . ",
+" . . .  ...  ...    .      .    ..    .  . . . . .",
+". . .    ...   .....       ..  ..   ...   . . . . ",
+" . . .    ...               ....   ..    . . . . .",
+". . . .    ....                   ..      . . . . ",
+" . . .       ...                 ..      . . . . .",
+". . . . .. .  ...               ..        . . . . ",
+" . . .         ...             ..          . . . .",
+". . .  .        ..             ..    .  .   . . . ",
+" . . .  . . .   ...           ..          .  . . .",
+". . . . .       ...          ..     .   .   . . . ",
+" . . .    .      ..          .             . . . .",
+". . . .      .   ...        ..    .  .      . . . ",
+" . . .  .  .      ...       .        .   . . . . .",
+". . . .       .    ..       ..  .         . . . . ",
+" . . .  .  .       ...      ..    .      . . . . .",
+". . .               ...      .            . . . . ",
+" . . .  .  . .      ...      ..   ..   . . . . . .",
+". . . .         .    ...     .......      . . . . ",
+" . . .  . .    .     ...      .... .     . . . . .",
+". . . .         .     ...         ..   .  . . . . ",
+" . . . . .  . .        ....      ..        . . . .",
+". . . .    .      .     ..........    . . . . . . ",
+" . . . . .    .      .    .......          . . . .",
+". . . . .   .   .                   . . . . . . . ",
+" . . . . . . . .  .  . .    .    .       . . . . .",
+". . . . . . . . . . . . . . . .   . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . "
+};
diff --git a/app-text/gv/gv-3.6.4.ebuild b/app-text/gv/gv-3.6.4.ebuild
deleted file mode 100644
index deadf318ad1e..000000000000
--- a/app-text/gv/gv-3.6.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.4.ebuild,v 1.2 2009/12/26 17:31:42 pva Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/gv/"
-SRC_URI="mirror://gnu/gv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/Xaw3d
-	app-text/ghostscript-gpl
-	x11-libs/libXt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gv-3.6.1-a0.patch
-
-	# Make font render nicely even with gs-8, bug 135354
-	sed -i \
-		-e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" \
-		src/{gv_{class,user,system}.ad,Makefile.am} || die "sed failed."
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		--enable-scrollbar-code || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	doicon src/gv_icon.xbm
-	make_desktop_entry gv "GhostView" /usr/share/pixmaps/gv_icon.xbm "Graphics;Viewer;"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-text/gv/gv-3.6.6.ebuild b/app-text/gv/gv-3.6.6.ebuild
deleted file mode 100644
index ec925689a936..000000000000
--- a/app-text/gv/gv-3.6.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.6.ebuild,v 1.2 2009/12/26 17:31:42 pva Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/gv/"
-SRC_URI="mirror://gnu/gv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/Xaw3d
-	app-text/ghostscript-gpl
-	x11-libs/libXt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gv-3.6.1-a0.patch
-
-	# Make font render nicely even with gs-8, bug 135354
-	sed -i \
-		-e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" \
-		src/Makefile.am || die "sed failed."
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		--enable-scrollbar-code || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	doicon src/gv_icon.xbm
-	make_desktop_entry gv "GhostView" /usr/share/pixmaps/gv_icon.xbm "Graphics;Viewer;"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-text/gv/gv-3.6.7.ebuild b/app-text/gv/gv-3.6.7.ebuild
deleted file mode 100644
index 1c0a75cecafb..000000000000
--- a/app-text/gv/gv-3.6.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.6.7.ebuild,v 1.2 2009/12/26 17:31:42 pva Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/gv/"
-SRC_URI="mirror://gnu/gv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/Xaw3d
-	app-text/ghostscript-gpl
-	x11-libs/libXt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gv-3.6.1-a0.patch
-
-	# Make font render nicely even with gs-8, bug 135354
-	sed -i \
-		-e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" \
-		src/Makefile.am || die "sed failed."
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		--enable-scrollbar-code || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	doicon src/gv_icon.xbm
-	make_desktop_entry gv "GhostView" /usr/share/pixmaps/gv_icon.xbm "Graphics;Viewer;"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-text/gv/gv-3.7.1.ebuild b/app-text/gv/gv-3.7.1.ebuild
new file mode 100644
index 000000000000..08d4c08b012d
--- /dev/null
+++ b/app-text/gv/gv-3.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.1.ebuild,v 1.1 2010/06/12 22:04:45 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
+HOMEPAGE="http://www.gnu.org/software/gv/"
+SRC_URI="mirror://gnu/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xinerama"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/Xaw3d
+	app-text/ghostscript-gpl
+	xinerama? ( x11-libs/libXinerama )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/gv-3.6.1-a0.patch
+
+	if ! use xinerama; then
+		sed -i -e 's:Xinerama:dIsAbLe&:' configure.ac || die
+	fi
+
+	sed -i \
+		-e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" \
+		src/Makefile.am || die #135354
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--enable-scrollbar-code
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	doicon "${FILESDIR}"/gv_icon.xpm
+	make_desktop_entry gv GhostView gv_icon "Graphics;Viewer"
+}