15 files changed, 45 insertions, 234 deletions
diff --git a/app-text/ggv/ChangeLog b/app-text/ggv/ChangeLog
index 71ac891ae678..f552789dae11 100644
--- a/app-text/ggv/ChangeLog
+++ b/app-text/ggv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ggv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ChangeLog,v 1.94 2005/07/02 14:44:32 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ChangeLog,v 1.95 2005/07/08 10:51:40 leonardop Exp $
+
+*ggv-2.8.5 (08 Jul 2005)
+
+  08 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> ggv-2.8.5.ebuild:
+  New release. Updated dependencies. Pass --enable-pdf-options switch to
+  'configure'.
 
   02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> ggv-2.8.3.ebuild:
   Stable on alpha.
diff --git a/app-text/ggv/Manifest b/app-text/ggv/Manifest
index 6429dca7757b..686445059e7f 100644
--- a/app-text/ggv/Manifest
+++ b/app-text/ggv/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b83f75e774b09c91c94bfc8b886cb296 ggv-2.4.1.ebuild 836
-MD5 60f6442292c0fca45e7a74b64563894d ggv-1.1.94.ebuild 1635
 MD5 f2ee66d7e641347eb5bc0789c1455c7c ChangeLog 10270
-MD5 46aa1a2b8628b77d75d5cb48da71000e ggv-2.8.0.ebuild 707
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 155aa49a998b0c63950f06e9fd5b9a8f ggv-2.8.3.ebuild 691
-MD5 c180346e986671c42b89eb4f398ba161 ggv-2.6.1.ebuild 706
+MD5 40fe63e72027c9e6b7b60b21ce516f2d ggv-2.8.5.ebuild 699
+MD5 6005c98d1aa121462f6503c03faff334 .ggv-2.8.5.ebuild.swp 12288
 MD5 65aab8d201b694e2b9bb4eb218914250 ggv-2.8.1.ebuild 682
-MD5 81ece27af0f5933df13a850ecbe46d66 ggv-2.6.0.ebuild 706
-MD5 68688e676f5d0f61aeb97e413dfdb041 files/digest-ggv-2.4.1 63
-MD5 5e8c7421876ca58a1e41e3075a394852 files/digest-ggv-2.6.1 63
-MD5 d14e7cb9a428e2a46f909b7d1da5cfab files/digest-ggv-2.6.0 63
-MD5 515619d60d10dc4e10d15e9b93af4541 files/ggv-2.4-fix_gtk+-2.4_build.patch 951
-MD5 0af782d2299128f802179dfd6b10cded files/digest-ggv-2.8.0 63
-MD5 16288c8ba59fe266eb9423753ec2c7f2 files/digest-ggv-2.8.3 63
-MD5 9839595041edeb9a62751cae70d30ea1 files/digest-ggv-1.1.94 62
+MD5 155aa49a998b0c63950f06e9fd5b9a8f ggv-2.8.3.ebuild 691
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 189e9705dfb51c79c4ed87e280c96bdc files/digest-ggv-2.8.5 63
 MD5 ebf8fa7fb4c1673eff3df32a5c46869e files/digest-ggv-2.8.1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCxqhoKf2g/qXtneoRAhcBAKClmn52Ro9iPrXkaFLk/c7vY0qslACfVPYh
-34eDM7WglPRQuhbioqa/Caw=
-=mY/z
------END PGP SIGNATURE-----
+MD5 16288c8ba59fe266eb9423753ec2c7f2 files/digest-ggv-2.8.3 63
diff --git a/app-text/ggv/files/digest-ggv-1.1.94 b/app-text/ggv/files/digest-ggv-1.1.94
deleted file mode 100644
index 4cc2b6e3d04f..000000000000
--- a/app-text/ggv/files/digest-ggv-1.1.94
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6cc996d0e8746dd70e76c8c591bbc773 ggv-1.1.94.tar.gz 734758
diff --git a/app-text/ggv/files/digest-ggv-2.4.1 b/app-text/ggv/files/digest-ggv-2.4.1
deleted file mode 100644
index 278fbaac6d4d..000000000000
--- a/app-text/ggv/files/digest-ggv-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d88e2c299d6062e85b8199f5f36c801 ggv-2.4.1.tar.bz2 1130149
diff --git a/app-text/ggv/files/digest-ggv-2.6.0 b/app-text/ggv/files/digest-ggv-2.6.0
deleted file mode 100644
index f071445053d5..000000000000
--- a/app-text/ggv/files/digest-ggv-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d3920904e16cb30903bfd114daf59f3 ggv-2.6.0.tar.bz2 1176804
diff --git a/app-text/ggv/files/digest-ggv-2.6.1 b/app-text/ggv/files/digest-ggv-2.6.1
deleted file mode 100644
index 819e97f01716..000000000000
--- a/app-text/ggv/files/digest-ggv-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f827eec334035c7ebe8cffcf4a04c2d1 ggv-2.6.1.tar.bz2 1223845
diff --git a/app-text/ggv/files/digest-ggv-2.8.0 b/app-text/ggv/files/digest-ggv-2.8.0
deleted file mode 100644
index c8c3c131567d..000000000000
--- a/app-text/ggv/files/digest-ggv-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a8e9e43ef793ef3221c5afb15d14a81 ggv-2.8.0.tar.bz2 1280464
diff --git a/app-text/ggv/files/digest-ggv-2.8.5 b/app-text/ggv/files/digest-ggv-2.8.5
new file mode 100644
index 000000000000..8502a549aede
--- /dev/null
+++ b/app-text/ggv/files/digest-ggv-2.8.5
@@ -0,0 +1 @@
+MD5 e8b338c1427e170ffbb33c62d0aaf191 ggv-2.8.5.tar.bz2 1285357
diff --git a/app-text/ggv/files/ggv-2.4-fix_gtk+-2.4_build.patch b/app-text/ggv/files/ggv-2.4-fix_gtk+-2.4_build.patch
deleted file mode 100644
index e9ff10e0ad11..000000000000
--- a/app-text/ggv/files/ggv-2.4-fix_gtk+-2.4_build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr ggv-2.4.1/configure ggv-2.4.1.patched/configure
---- ggv-2.4.1/configure	2004-02-04 21:34:30.000000000 +0100
-+++ ggv-2.4.1.patched/configure	2004-03-28 18:25:01.405058360 +0200
-@@ -21944,7 +21944,7 @@
- BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
- 
- 
--GGV_EXTRA_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
-+GGV_EXTRA_CFLAGS=
- 
- 
- 
-diff -uNr ggv-2.4.1/configure.in ggv-2.4.1.patched/configure.in
---- ggv-2.4.1/configure.in	2004-02-04 21:33:57.000000000 +0100
-+++ ggv-2.4.1.patched/configure.in	2004-03-28 18:25:18.287491840 +0200
-@@ -148,7 +148,7 @@
- BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
- AC_SUBST(BONOBO_ACT_IDLDIR)
-       
--GGV_EXTRA_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
-+GGV_EXTRA_CFLAGS=
- 
- AC_SUBST(GGV_EXTRA_CFLAGS)
- AC_SUBST(CFLAGS)
diff --git a/app-text/ggv/ggv-1.1.94.ebuild b/app-text/ggv/ggv-1.1.94.ebuild
deleted file mode 100644
index cb01bea99ba9..000000000000
--- a/app-text/ggv/ggv-1.1.94.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-1.1.94.ebuild,v 1.20 2005/01/01 16:14:59 eradicator Exp $
-
-IUSE="nls bonobo"
-
-DESCRIPTION="Gnome Ghostview"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
-
-RDEPEND=">=gnome-base/gnome-libs-1.4.1.4
-	bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/psviewer"
-
-src_compile() {
-	local myconf=""
-
-	use nls || myconf="--disable-nls"
-	if use bonobo; then
-		myconf="${myconf} --with-bonobo"
-	else
-		myconf="${myconf} --without-bonobo"
-	fi
-
-	./configure --build=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--disable-install-schemas \
-		${myconf} || die
-
-	# CFLAGS was slurped up by ./configure above.  It's now in the
-	# Makefiles.  We don't want to override it with our own.
-	unset CFLAGS
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		install || die
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README TODO
-}
-
-pkg_postinst() {
-	# This is from the devhelp ebuild...
-	# Fix gconf permissions
-	killall gconfd-1 2>/dev/null >/dev/null
-	chmod o+rX /etc/gconf -R
-	# Install schemas
-	gconftool-1 --shutdown
-	SOURCE=xml::/etc/gconf/gconf.xml.defaults
-	GCONF_CONFIG_SOURCE=$SOURCE \
-		gconftool-1 --makefile-install-rule \
-		/etc/gconf/schemas/${PN}.schemas
-	assert "gconftool-1 execution failed"
-}
diff --git a/app-text/ggv/ggv-2.4.1.ebuild b/app-text/ggv/ggv-2.4.1.ebuild
deleted file mode 100644
index c1de591ed8a6..000000000000
--- a/app-text/ggv/ggv-2.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.4.1.ebuild,v 1.16 2005/01/01 16:14:59 eradicator Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The GNOME PostScript document viewer"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
-IUSE=""
-
-RDEPEND=">=gnome-base/libgnomeui-2
-	>=gnome-base/orbit-2.4.1
-	>=gnome-base/gnome-vfs-2.2
-	virtual/ghostscript
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21"
-
-PROVIDE="virtual/psviewer"
-
-DOCS="AUTHORS ChangeLog INSTALL MAINTAINERS TODO README"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix build with gtk+-2.4 #45794
-	epatch ${FILESDIR}/${PN}-2.4-fix_gtk+-2.4_build.patch
-}
diff --git a/app-text/ggv/ggv-2.6.0.ebuild b/app-text/ggv/ggv-2.6.0.ebuild
deleted file mode 100644
index 0be9e2d5b67b..000000000000
--- a/app-text/ggv/ggv-2.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.6.0.ebuild,v 1.12 2005/01/01 16:14:59 eradicator Exp $
-
-inherit gnome2
-
-DESCRIPTION="The GNOME PostScript document viewer"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 FDL-1.1"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
-
-RDEPEND=">=x11-libs/gtk+-2.3
-	>=gnome-base/libgnomeui-2.5
-	>=gnome-base/orbit-2.4.1
-	virtual/ghostscript
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30"
-
-PROVIDE="virtual/psviewer"
-
-DOCS="AUTHORS ChangeLog COPYING* INSTALL MAINTAINERS TODO README"
diff --git a/app-text/ggv/ggv-2.6.1.ebuild b/app-text/ggv/ggv-2.6.1.ebuild
deleted file mode 100644
index 99a122327c04..000000000000
--- a/app-text/ggv/ggv-2.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.6.1.ebuild,v 1.11 2005/01/01 16:14:59 eradicator Exp $
-
-inherit gnome2
-
-DESCRIPTION="The GNOME PostScript document viewer"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 FDL-1.1"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ~ppc alpha sparc hppa amd64 ~ia64 mips"
-
-RDEPEND=">=x11-libs/gtk+-2.3
-	>=gnome-base/libgnomeui-2.5
-	>=gnome-base/orbit-2.4.1
-	virtual/ghostscript
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30"
-
-PROVIDE="virtual/psviewer"
-
-DOCS="AUTHORS ChangeLog COPYING* INSTALL MAINTAINERS TODO README"
diff --git a/app-text/ggv/ggv-2.8.0.ebuild b/app-text/ggv/ggv-2.8.0.ebuild
deleted file mode 100644
index 2f13de64ea25..000000000000
--- a/app-text/ggv/ggv-2.8.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.8.0.ebuild,v 1.7 2005/01/01 16:14:59 eradicator Exp $
-
-inherit gnome2
-
-DESCRIPTION="The GNOME PostScript document viewer"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 FDL-1.1"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc ~hppa ~amd64 ~ia64 ~mips"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/orbit-2.4.1
-	virtual/ghostscript
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30"
-
-PROVIDE="virtual/psviewer"
-
-DOCS="AUTHORS ChangeLog COPYING* INSTALL MAINTAINERS TODO README"
diff --git a/app-text/ggv/ggv-2.8.5.ebuild b/app-text/ggv/ggv-2.8.5.ebuild
new file mode 100644
index 000000000000..a56024e49704
--- /dev/null
+++ b/app-text/ggv/ggv-2.8.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.8.5.ebuild,v 1.1 2005/07/08 10:51:41 leonardop Exp $
+
+inherit gnome2
+
+DESCRIPTION="The GNOME PostScript document viewer"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/gconf-2
+	virtual/ghostscript
+	dev-libs/popt"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.30"
+
+PROVIDE="virtual/psviewer"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+G2CONF="${G2CONF} --enable-pdf-options $(use_enable debug bonobo-debug)"