Drop -traditional from CPPFLAGS, bug #547318; enhance preprocessor definitions

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

2 files changed, 100 insertions, 1 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index 090210bbf6ae..dac499ca3b9d 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/rasmol
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.44 2015/03/29 09:36:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.45 2015/05/18 07:01:19 jlec Exp $
+
+*rasmol-2.7.5.2-r2 (18 May 2015)
+
+  18 May 2015; Justin Lecher <jlec@gentoo.org> +rasmol-2.7.5.2-r2.ebuild:
+  Drop -traditional from CPPFLAGS, bug #547318; enhance preprocessor definitions
 
   29 Mar 2015; Justin Lecher <jlec@gentoo.org> -files/ldflags.patch,
   -files/rasmol.sh.debian, -rasmol-2.7.5.2.ebuild:
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
new file mode 100644
index 000000000000..060eb362e4a7
--- /dev/null
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild,v 1.1 2015/05/18 07:01:19 jlec Exp $
+
+EAPI=5
+
+inherit eutils fortran-2 multilib prefix toolchain-funcs
+
+MY_P="RasMol_${PV}"
+VERS="13May11"
+
+DESCRIPTION="Molecular Graphics Visualisation Tool"
+HOMEPAGE="http://www.openrasmol.org/"
+#SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz"
+#SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/RasMol.tar.gz"
+
+LICENSE="|| ( GPL-2 RASLIC )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/cvector
+	dev-util/gtk-builder-convert
+	>=sci-libs/cbflib-0.9.2
+	>=sci-libs/cqrlib-1.1.2
+	>=sci-libs/neartree-3.1.1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/vte:0"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto"
+
+#S="${WORKDIR}/${PN}-2.7.5-${VERS}"
+S="${WORKDIR}/RasMol-${PV}"
+
+src_prepare() {
+	cd src || die
+
+	epatch \
+		"${FILESDIR}"/${P}-glib.h.patch \
+		"${FILESDIR}"/${P}-format-security.patch \
+		"${FILESDIR}"/${P}-longlong.patch
+
+	if use amd64 || use amd64-linux; then
+		mv rasmol.h rasmol_amd64_save.h && \
+		echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h
+	fi
+
+	sed \
+		-e 's:-traditional::g' \
+		-i Makefile* || die
+
+	cat > Imakefile <<- EOF
+	#define PIXELDEPTH 32
+	#define GTKWIN
+	EOF
+
+	cat Imakefile_base >> Imakefile || die
+	epatch "${FILESDIR}"/2.7.5-bundled-lib.patch
+
+	eprefixify Imakefile
+
+	xmkmf -DGTKWIN || die "xmkmf failed with ${myconf}"
+}
+
+src_compile() {
+	emake -C src clean
+	emake \
+		-C src \
+		DEPTHDEF=-DTHIRTYTWOBIT \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install () {
+	libdir=$(get_libdir)
+	insinto /usr/${libdir}/${PN}
+	doins doc/rasmol.hlp
+	dobin src/rasmol
+	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
+	doman doc/rasmol.1
+	insinto /usr/${libdir}/${PN}/databases
+	doins data/*
+
+	dohtml -r *html doc/*.html html_graphics
+}