Version bump.

7 files changed, 107 insertions, 20 deletions

diff --git a/sci-electronics/gerbv/ChangeLog b/sci-electronics/gerbv/ChangeLog
index f9e2b4f4bc2a..68920e87b7fa 100644
--- a/sci-electronics/gerbv/ChangeLog
+++ b/sci-electronics/gerbv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/gerbv
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/ChangeLog,v 1.2 2004/12/27 20:55:27 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/ChangeLog,v 1.3 2005/01/02 02:01:39 plasmaroo Exp $
+
+*gerbv-1.0.0 (02 Jan 2005)
+
+  02 Jan 2005; <plasmaroo@gentoo.org> +gerbv-1.0.0.ebuild,
+  +files/gerbv-1.0.0-Xinerama.patch:
+  Version bump.
 
 *gerbv-0.16 (27 Dec 2004)
 
diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest
index 8e4f643e50d8..94efa68d2728 100644
--- a/sci-electronics/gerbv/Manifest
+++ b/sci-electronics/gerbv/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3b746c2de5ddea01497397b00374358b gerbv-0.16.ebuild 1087
-MD5 9428b8149cc93105bff06844b8e52481 gerbv-0.15.ebuild 699
-MD5 0ffecc8f26e685627283eef5891e9158 ChangeLog 1032
+MD5 3fdfad6762997d80e346422646aa494c ChangeLog 1174
+MD5 8f08a8937ff0c9f100ae286a74fc7f2b gerbv-0.15.ebuild 700
 MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
-MD5 e6c0f51c5a63b102adb80fc2c0109d16 files/digest-gerbv-0.15 63
+MD5 fd88c71ecbaf009f27c59ebf032fb7a0 gerbv-1.0.0.ebuild 1083
+MD5 0d8ffddcfe34014e4695bace92aab914 gerbv-0.16.ebuild 1019
+MD5 95a742035053dbd10fa21c5e7de0f6a5 files/digest-gerbv-1.0.0 64
+MD5 8406753908cf0fbdd37a69d1867720db files/gerbv-1.0.0-Xinerama.patch 1484
 MD5 8869170c2eb362b80bd88baa7fd4846e files/digest-gerbv-0.16 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB0HbFI1lqEGTUzyQRAhh0AJ49z/KJAulnQ8oxW/2YdQkzao719wCfVqJl
-nYeMr2toD4IO5bLiieIMVJQ=
-=9pvR
------END PGP SIGNATURE-----
+MD5 e6c0f51c5a63b102adb80fc2c0109d16 files/digest-gerbv-0.15 63
diff --git a/sci-electronics/gerbv/files/digest-gerbv-1.0.0 b/sci-electronics/gerbv/files/digest-gerbv-1.0.0
new file mode 100644
index 000000000000..9c243669992b
--- /dev/null
+++ b/sci-electronics/gerbv/files/digest-gerbv-1.0.0
@@ -0,0 +1 @@
+MD5 20a9e90c7045e7590a462cd9ef76f408 gerbv-1.0.0.tar.gz 1033785
diff --git a/sci-electronics/gerbv/files/gerbv-1.0.0-Xinerama.patch b/sci-electronics/gerbv/files/gerbv-1.0.0-Xinerama.patch
new file mode 100644
index 000000000000..40e296b8c568
--- /dev/null
+++ b/sci-electronics/gerbv/files/gerbv-1.0.0-Xinerama.patch
@@ -0,0 +1,44 @@
+diff -ur gerbv-1.0.0/ChangeLog gerbv-1.0.0.new/ChangeLog
+--- gerbv-1.0.0/ChangeLog	2004-12-27 23:31:10.000000000 +0000
++++ gerbv-1.0.0.new/ChangeLog	2005-01-02 01:54:21.074734456 +0000
+@@ -269,6 +269,10 @@
+ 	* src/gerber.c: Doesn't warn anymore if a gerber file requests an
+ 	  image rotate on zero degrees. Reported by Balaji V.
+ 
++2003-03-03  Jeffrey W. Baker <jwbaker@acm.org>
++ 	
++	* src/gerbv.c: fix initial window size for multihead systems.
++
+ 2003-03-02  Stefan Petersen  <spe@stacken.kth.se>
+ 
+ 	* src/draw_amacro.c: Aperture macro primitive 1 is a filled circle.
+diff -ur gerbv-1.0.0/src/gerbv.c gerbv-1.0.0.new/src/gerbv.c
+--- gerbv-1.0.0/src/gerbv.c	2004-09-24 20:12:25.000000000 +0100
++++ gerbv-1.0.0.new/src/gerbv.c	2005-01-02 01:53:21.241830440 +0000
+@@ -2485,7 +2485,7 @@
+     GtkWidget *hbox;
+     GtkWidget *menubar;
+     GtkStyle  *textStyle;
+-    gint      screen_width, width, height;
++    gint      width, height;
+     int       read_opt;
+     int       i;
+     int       req_width = -1, req_height = -1, req_x = 0, req_y = 0;
+@@ -2611,9 +2610,14 @@
+ 	width = req_width;
+ 	height = req_height;
+     } else {
+-	screen_width = gdk_screen_width();
+-	width = screen_width * 3/4;
+-	height = width * 3/4;
++	GdkScreen *screen;
++	int nmonitors;
++
++	screen = gdk_screen_get_default();
++	nmonitors = gdk_screen_get_n_monitors(screen);
++
++	width = gdk_screen_get_width(screen) * 3/4 / nmonitors;
++	height = gdk_screen_get_height(screen) * 3/4 / nmonitors;
+     }
+ 
+     /*
diff --git a/sci-electronics/gerbv/gerbv-0.15.ebuild b/sci-electronics/gerbv/gerbv-0.15.ebuild
index 743ce536a602..a32cbb3ccc75 100644
--- a/sci-electronics/gerbv/gerbv-0.15.ebuild
+++ b/sci-electronics/gerbv/gerbv-0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-0.15.ebuild,v 1.1 2004/12/27 19:18:02 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-0.15.ebuild,v 1.2 2005/01/02 02:01:39 plasmaroo Exp $
 
 DESCRIPTION="gerbv - The gEDA Gerber Viewer"
 SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
diff --git a/sci-electronics/gerbv/gerbv-0.16.ebuild b/sci-electronics/gerbv/gerbv-0.16.ebuild
index 10e9da651d02..40e7803bef8c 100644
--- a/sci-electronics/gerbv/gerbv-0.16.ebuild
+++ b/sci-electronics/gerbv/gerbv-0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation and Tim Yamin <plasmaroo@gentoo.org> <plasmaroo@squirrelsoft.org.uk>
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-0.16.ebuild,v 1.1 2004/12/27 19:18:02 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-0.16.ebuild,v 1.2 2005/01/02 02:01:39 plasmaroo Exp $
 
 DESCRIPTION="gerbv - The gEDA Gerber Viewer"
 SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
diff --git a/sci-electronics/gerbv/gerbv-1.0.0.ebuild b/sci-electronics/gerbv/gerbv-1.0.0.ebuild
new file mode 100644
index 000000000000..63c1a054cb18
--- /dev/null
+++ b/sci-electronics/gerbv/gerbv-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-1.0.0.ebuild,v 1.1 2005/01/02 02:01:39 plasmaroo Exp $
+
+inherit eutils
+
+DESCRIPTION="gerbv - The gEDA Gerber Viewer"
+SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
+HOMEPAGE="http://www.geda.seul.org"
+
+IUSE="doc gtk2 png xinerama"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="gtk2? ( =x11-libs/gtk+-2* )
+	!gtk2? ( =x11-libs/gtk+-1* )
+	png? ( media-libs/libpng )
+	png? ( media-libs/gdk-pixbuf )
+	virtual/x11"
+
+src_compile() {
+	local confOptions
+
+	use gtk2 && confOptions='--enable-gtk2'
+	use gtk2 && use xinerama && epatch ${FILESDIR}/${P}-Xinerama.patch
+	use png || confOptions="$confOptions --disable-exportpng"
+
+	econf $confOptions || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	if use doc; then
+		cd doc
+		dodoc sources.txt
+		use png && dodoc PNG-print/PNGPrintMiniHowto.txt
+		docinto eagle
+		dodoc eagle/eagle2exc*
+	fi
+}