[gentoo-commits] proj/sci:ccp4 commit in: x11-libs/libxdl_view/files/, x11-libs/libxdl_view/

[Justin Lecher]

commit:     60635b48d915a8c9fa4a7f502642b9d1c1bfd090
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 11:20:26 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 11:20:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=60635b48

x11-libs/libxdl_view: Import patch from 6.3.0

Package-Manager: portage-2.2.0_alpha177

---
 x11-libs/libxdl_view/ChangeLog                     |  70 +++++++++++
 x11-libs/libxdl_view/files/4.2-as-needed.patch     |  16 +++
 x11-libs/libxdl_view/files/4.2-impl-dec.patch      |  13 ++
 .../files/libxdl_view-4.2-ccp4-6.3.0.patch         | 131 +++++++++++++++++++++
 x11-libs/libxdl_view/libxdl_view-4.2-r3.ebuild     |  33 ++++++
 x11-libs/libxdl_view/metadata.xml                  |   8 ++
 6 files changed, 271 insertions(+)

diff --git a/x11-libs/libxdl_view/ChangeLog b/x11-libs/libxdl_view/ChangeLog
new file mode 100644
index 0000000..009c46a
--- /dev/null
+++ b/x11-libs/libxdl_view/ChangeLog
@@ -0,0 +1,70 @@
+# ChangeLog for x11-libs/libxdl_view
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/ChangeLog,v 1.15 2012/08/26 13:43:57 jlec Exp $
+
+*libxdl_view-4.2-r3 (02 Jun 2013)
+
+  02 Jun 2013; Justin Lecher <jlec@g.o> +libxdl_view-4.2-r3.ebuild,
+  +files/4.2-as-needed.patch, +files/libxdl_view-4.2-ccp4-6.3.0.patch,
+  +files/4.2-impl-dec.patch, +metadata.xml:
+  Import patch from 6.3.0
+
+  26 Aug 2012; Justin Lecher <jlec@g.o> -libxdl_view-4.2-r1.ebuild:
+  Drop old
+
+  21 Aug 2012; Johannes Huber <johu@g.o> libxdl_view-4.2-r2.ebuild:
+  Stable for x86, wrt bug #429232
+
+  04 Aug 2012; Anthony G. Basile <blueness@g.o>
+  libxdl_view-4.2-r2.ebuild:
+  Stable ppc, bug #429232
+
+  03 Aug 2012; Agostino Sarubbo <ago@g.o> libxdl_view-4.2-r2.ebuild:
+  Stable for amd64, wrt bug #429232
+
+*libxdl_view-4.2-r2 (30 May 2012)
+
+  30 May 2012; Justin Lecher <jlec@g.o> files/4.2-as-needed.patch,
+  +libxdl_view-4.2-r2.ebuild:
+  Fix underlinking
+
+  30 Apr 2012; Justin Lecher <jlec@g.o> libxdl_view-4.2-r1.ebuild,
+  metadata.xml:
+  Handle static libs
+
+  21 Nov 2011; Justin Lecher <jlec@g.o> libxdl_view-4.2-r1.ebuild:
+  keyworded for ~x86-macos ~x64-macos, tested by Johan Hattne #390123
+
+  28 Jun 2011; Brent Baude <ranger@g.o> libxdl_view-4.2-r1.ebuild:
+  Marking libxdl_view-4.2-r1 ppc for bug 352117
+
+  01 Feb 2011; Thomas Kahle <tomka@g.o> libxdl_view-4.2-r1.ebuild:
+  x86 stable per bug 352117
+
+  20 Jan 2011; Markos Chandras <hwoarang@g.o> libxdl_view-4.2-r1.ebuild:
+  Stable on amd64 wrt bug #352117
+
+  19 Jan 2011; Justin Lecher <jlec@g.o> files/4.2-as-needed.patch,
+  files/4.2-impl-dec.patch:
+  Parallel compilation fix, 352119
+
+  16 Jan 2011; Kacper Kowalik <xarthisius@g.o>
+  libxdl_view-4.2-r1.ebuild:
+  marked ~ppc wrt #303931
+
+*libxdl_view-4.2-r1 (11 Nov 2010)
+
+  11 Nov 2010; Justin Lecher <jlec@g.o> files/4.2-as-needed.patch,
+  -libxdl_view-4.2.ebuild, +files/4.2-impl-dec.patch,
+  +libxdl_view-4.2-r1.ebuild:
+  Fix for implict declarations and underlinking
+
+  29 Mar 2010; Justin Lecher <jlec@g.o> libxdl_view-4.2.ebuild:
+  Keyworded for ~x86-linux ~amd64-linux
+
+*libxdl_view-4.2 (02 Feb 2010)
+
+  02 Feb 2010; Justin Lecher (jlec) <jlec@g.o>
+  +files/4.2-as-needed.patch, +libxdl_view-4.2.ebuild, +metadata.xml:
+  Xlib for ccp4
+

diff --git a/x11-libs/libxdl_view/files/4.2-as-needed.patch b/x11-libs/libxdl_view/files/4.2-as-needed.patch
new file mode 100644
index 0000000..a59d199
--- /dev/null
+++ b/x11-libs/libxdl_view/files/4.2-as-needed.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.am b/Makefile.am
+index 347bb21..cbb04db 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,11 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la
+ ## The initial value of this was a mistake!
+ ## See the libtool doc.
+ libxdl_view_la_LDFLAGS = -version-info 2:0:0
++libxdl_view_la_LIBADD = -lX11 -lXt -lm
++
+ libxdl_viewextra_la_LDFLAGS = -version-info 0:0:0
++libxdl_viewextra_la_DEPENDENCIES = libxdl_view.la
++libxdl_viewextra_la_LIBADD = -lm -lxdl_view -ljwc_c
+ 
+ EXTRA_DIST = doc/xdl_view_icon.gif doc/xdl_view_top.gif			 \
+   doc/xdl_view_top.html doc/xdl_view_updates.html			 \

diff --git a/x11-libs/libxdl_view/files/4.2-impl-dec.patch b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
new file mode 100644
index 0000000..4181437
--- /dev/null
+++ b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 347bb21..aa41ba3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,6 +3,8 @@
+ 
+ ## Process this file with automake.
+ 
++CFLAGS += -std=c99 -L.libs
++
+ libxdl_view_la_SOURCES = xdl_base_fr.c xdl_blank_obj.c xdl_image.c \
+   xdl_bg.c xdl_img_rd.c xdl_film_img.c xdl_io_window.c \
+   xdl_menu_area.c xdl_text_tab.c xdl_panel_itm.c \

diff --git a/x11-libs/libxdl_view/files/libxdl_view-4.2-ccp4-6.3.0.patch b/x11-libs/libxdl_view/files/libxdl_view-4.2-ccp4-6.3.0.patch
new file mode 100644
index 0000000..5111efb
--- /dev/null
+++ b/x11-libs/libxdl_view/files/libxdl_view-4.2-ccp4-6.3.0.patch
@@ -0,0 +1,131 @@
+--- a/src/xdl_laue_sim.c
++++ b/src/xdl_laue_sim.c
+@@ -790,8 +790,8 @@
+    if (gnomr>0.1)
+    {
+       gd->gnom = 1;
+-      thg = piov2 - 0.5*atanf(gnomr/ctof);
+-      gd->gdist = filmr/tanf(thg);
++      thg = piov2 - 0.5*atan(gnomr/ctof);
++      gd->gdist = filmr/tan(thg);
+       gd->gnomr = gnomr;
+    }
+ 
+@@ -891,12 +891,12 @@
+    {
+       if (gd->gnom)
+       {
+-         r1 = sqrtf (gd->xf[i]*gd->xf[i]+gd->yf[i]*gd->yf[i]);
++         r1 = sqrt (gd->xf[i]*gd->xf[i]+gd->yf[i]*gd->yf[i]);
+          if (r1>=gnomr)
+ 	 {
+-            twoth = atanf (r1/gd->ctof);
++            twoth = atan (r1/gd->ctof);
+             thg = piov2 - 0.5*twoth;
+-            r2 = gd->gdist*tanf(thg);
++            r2 = gd->gdist*tan(thg);
+             ratio = r2/r1;
+             d = ratio*((gd->xf[i]/gd->filmr)*(float)gd->half_size);
+             gd->xpix[i] = gd->half_size + ((d>0.0)?(int)(d+0.5):(int)(d-0.5));
+@@ -4330,11 +4330,11 @@
+                ratio = 1.0;
+                if (gd->gnom)
+ 	       {
+-                  r1 = sqrtf (gd->xf[k]*gd->xf[k]+gd->yf[k]*gd->yf[k]);
++                  r1 = sqrt (gd->xf[k]*gd->xf[k]+gd->yf[k]*gd->yf[k]);
+                   if (r1<gd->gnomr) continue;
+-                  twoth = atanf (r1/gd->ctof);
++                  twoth = atan (r1/gd->ctof);
+                   thg = piov2 - 0.5*twoth;
+-                  r2 = gd->gdist*tanf(thg);
++                  r2 = gd->gdist*tan(thg);
+                   ratio = r2/r1;
+                }
+                xs = ratio*gd->ps_scal*gd->xf[k]*gd->mm_to_p + gd->ps_xc;
+@@ -4421,11 +4421,11 @@
+                ratio = 1.0;
+                if (gd->gnom)
+ 	       {
+-                  r1 = sqrtf (gd->xf[k]*gd->xf[k]+gd->yf[k]*gd->yf[k]);
++                  r1 = sqrt (gd->xf[k]*gd->xf[k]+gd->yf[k]*gd->yf[k]);
+                   if (r1<gd->gnomr) continue;
+-                  twoth = atanf (r1/gd->ctof);
++                  twoth = atan (r1/gd->ctof);
+                   thg = piov2 - 0.5*twoth;
+-                  r2 = gd->gdist*tanf(thg);
++                  r2 = gd->gdist*tan(thg);
+                   ratio = r2/r1;
+                }
+                xs = ratio*gd->ps_scal*gd->xf[k]*gd->mm_to_p + gd->ps_xc;
+@@ -4502,11 +4502,11 @@
+                ratio = 1.0;
+                if (gd->gnom)
+ 	       {
+-                  r1 = sqrtf (gd->xf[k]*gd->xf[k]+gd->yf[k]*gd->yf[k]);
++                  r1 = sqrt (gd->xf[k]*gd->xf[k]+gd->yf[k]*gd->yf[k]);
+                   if (r1<gd->gnomr) continue;
+-                  twoth = atanf (r1/gd->ctof);
++                  twoth = atan (r1/gd->ctof);
+                   thg = piov2 - 0.5*twoth;
+-                  r2 = gd->gdist*tanf(thg);
++                  r2 = gd->gdist*tan(thg);
+                   ratio = r2/r1;
+                }
+                xs = ratio*gd->ps_scal*gd->xf[k]*gd->mm_to_p + gd->ps_xc;
+@@ -4733,11 +4733,11 @@
+       ratio = 1.0;
+       if (gd->gnom)
+       {
+-         r1 = sqrtf (gd->xf[i]*gd->xf[i]+gd->yf[i]*gd->yf[i]);
++         r1 = sqrt (gd->xf[i]*gd->xf[i]+gd->yf[i]*gd->yf[i]);
+          if (r1<gd->gnomr) continue;
+-         twoth = atanf (r1/gd->ctof);
++         twoth = atan (r1/gd->ctof);
+          thg = piov2 - 0.5*twoth;
+-         r2 = gd->gdist*tanf(thg);
++         r2 = gd->gdist*tan(thg);
+          ratio = r2/r1;
+       }
+       xs = ratio*gd->ps_scal*gd->xf[i]*gd->mm_to_p + gd->ps_xc;
+@@ -5015,11 +5015,11 @@
+    ratio = 1.0;
+    if (gd->gnom)
+    {
+-      r1 = sqrtf (gd->xf[lt->idx]*gd->xf[lt->idx]
++      r1 = sqrt (gd->xf[lt->idx]*gd->xf[lt->idx]
+                   +gd->yf[lt->idx]*gd->yf[lt->idx]);
+-      twoth = atanf (r1/gd->ctof);
++      twoth = atan (r1/gd->ctof);
+       thg = piov2 - 0.5*twoth;
+-      r2 = gd->gdist*tanf(thg);
++      r2 = gd->gdist*tan(thg);
+       ratio = r2/r1;
+    }
+    xsp = ratio*gd->ps_scal*gd->xf[lt->idx]*gd->mm_to_p + gd->ps_xc;
+@@ -5408,8 +5408,8 @@
+    if (gnomr>0.1)
+    {
+       gd->gnom = 1;
+-      thg = piov2 - 0.5*atanf(gnomr/ctof);
+-      gd->gdist = filmr/tanf(thg);
++      thg = piov2 - 0.5*atan(gnomr/ctof);
++      gd->gdist = filmr/tan(thg);
+       gd->gnomr = gnomr;
+    }
+ 
+@@ -5419,12 +5419,12 @@
+    {
+       if (gd->gnom)
+       {
+-         r1 = sqrtf (gd->xf[i]*gd->xf[i]+gd->yf[i]*gd->yf[i]);
++         r1 = sqrt (gd->xf[i]*gd->xf[i]+gd->yf[i]*gd->yf[i]);
+          if (r1>=gnomr)
+ 	 {
+-            twoth = atanf (r1/gd->ctof);
++            twoth = atan (r1/gd->ctof);
+             thg = piov2 - 0.5*twoth;
+-            r2 = gd->gdist*tanf(thg);
++            r2 = gd->gdist*tan(thg);
+             ratio = r2/r1;
+             d = ratio*((gd->xf[i]/gd->filmr)*(float)gd->half_size);
+             gd->xpix[i] = gd->half_size + ((d>0.0)?(int)(d+0.5):(int)(d-0.5));

diff --git a/x11-libs/libxdl_view/libxdl_view-4.2-r3.ebuild b/x11-libs/libxdl_view/libxdl_view-4.2-r3.ebuild
new file mode 100644
index 0000000..1389a5b
--- /dev/null
+++ b/x11-libs/libxdl_view/libxdl_view-4.2-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild,v 1.5 2012/08/21 16:12:38 johu Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils
+
+DESCRIPTION="An X-Windows Based Toolkit"
+HOMEPAGE="http://www.ccp4.ac.uk/dist/x-windows/xdl_view/doc/xdl_view_top.html"
+SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libjwc_c
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-ccp4-6.3.0.patch
+		"${FILESDIR}"/${PV}-impl-dec.patch
+		"${FILESDIR}"/${PV}-as-needed.patch	)
+
+src_prepare() {
+	rm missing || die
+	autotools-utils_src_prepare
+}

diff --git a/x11-libs/libxdl_view/metadata.xml b/x11-libs/libxdl_view/metadata.xml
new file mode 100644
index 0000000..4bf6dbc
--- /dev/null
+++ b/x11-libs/libxdl_view/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <maintainer>
+    <email>sci@g.o</email>
+  </maintainer>
+</pkgmetadata>