Fix compilation problems on ppc, bug #547318; drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 36 insertions, 105 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index dac499ca3b9d..2a114fb5e029 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,10 @@
 # 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.45 2015/05/18 07:01:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.46 2015/06/17 14:39:33 jlec Exp $
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org> -rasmol-2.7.5.2-r1.ebuild,
+  rasmol-2.7.5.2-r2.ebuild:
+  Fix compilation problems on ppc, bug #547318; drop old
 
 *rasmol-2.7.5.2-r2 (18 May 2015)
 
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 8d4b8caeb63b..fc3f00d95d5c 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -6,26 +6,25 @@ AUX rasmol-2.7.5.2-format-security.patch 1617 SHA256 6171a944ac63bcbc18e8d4a1aab
 AUX rasmol-2.7.5.2-glib.h.patch 770 SHA256 4093621678676bdc7c517f6d6c260f495b9d946d57691d8e58371b627cd6c178 SHA512 d743b89817d0ed2aa551f3a6529e5bcc50c811d79c0deddd50d07a59614cb0c2d71500452ff9aec4b4b84e4985d9851f61aafa30196356aa1724212b5159375e WHIRLPOOL 250e59fbafe5d53f1dfd77bc2392cf085b07968578675e61635c8ca2e5de1dd60f060240f2a9afdb088285bac3a94cb695cecd3abbb93214f2d6fcf584fe8a16
 AUX rasmol-2.7.5.2-longlong.patch 396 SHA256 98503ec652d13e62443275536d86a8abefae6f6006441425026d400f40f25607 SHA512 4c3ce01ade36fe8a9512bdac62bcd47268bcc5a0448f4af69b26d8add9cc8495d376bac33a8ae5aeae42fa114a1cba980ce86559bf2d52334257f2e001c011d3 WHIRLPOOL 812ff6f3b2d3a6d5dc4ce1c0a9ebf627998b4df355bf435ff1a2e43b3ba369d29fed8cd8ffeef472a62735f71a4bfa2bf89812dafb7f11ec4be34716793f95a7
 DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 SHA256 b975e6e69d5c6b161a81f04840945d2f220ac626245c61bcc6c56181b73a5718 SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f WHIRLPOOL 261c5351e32a67807d2979b73fbdf83b947aa641568c08fd2f2b0e06115330541a56f7bbd8f05313c86554c321e59cfe11bf5ee613c09249b9e149411c61d5ca
-EBUILD rasmol-2.7.5.2-r1.ebuild 2052 SHA256 73e96f2b36a8b484950dea6a738275784c5c210997c4bde99f9fd8d0170d77a7 SHA512 37a7a3603507013c40ed434352b815f2951c8bdb9b5270a72432477cb9136d133feaf0ec20151dffb721b3362be9afbd6c8c549544cf0f517bb4c3bed2d7236b WHIRLPOOL 14a97aed8b0742790c6c596bb2d7216756c9bcf45e8968ebdf960b4ddeffd9c4f269c3ecd75bf7e20a21ee5dbebb3be1d3d82abb95cad40c9c40f6864fc80e20
-EBUILD rasmol-2.7.5.2-r2.ebuild 2177 SHA256 326242065855d0cc34dcc9c3952be825ed98ce715102cd4b810087cb6083a8b6 SHA512 1008288771e12ad2af5dda97817c6fea1803937d46c7e288421757822842bdeeb4c030822d7babcc1b3a3b13ac35ede212e3182dd013193c33d0392f4e6530ef WHIRLPOOL c7b3139fb8087c300bb9ea12e72f02fda6c525ed74357549f8ee49fa25dc9ba2bf8fba004a11580fbc3edd8706e02b8ea99e095ae0010ae7fef5e04051df9d32
-MISC ChangeLog 7865 SHA256 7f1f3782622371b9133a2f7525b79753e86ad153d3f2d47b8956155f0042b946 SHA512 2c2f8c5ef48f22548b88f905abc6c84852fd2109af925bfb97006a8dedfa58eadeb6b3b68bd075f112dbf69129ae4dd1c0749767cebaec68d0fc3303ad63a602 WHIRLPOOL 922dd712ac01a9fb661fbee5b3e0fbd60c7fd79bf0dfd5473e8d85b3cfefaeae121e995166c34d89874b3a575ce3fccdc6a491b555796de9b7837f442611003a
+EBUILD rasmol-2.7.5.2-r2.ebuild 2421 SHA256 e7c3d22c4f8b4eb1fd8612dc94bcf878d9910350b86cd078e060ee46d087bbfa SHA512 af3f4ed7cdb501600f77d88b3f4e064a8a6831bae2bd05f41afbbfa56671a453d180f44f58ebce2466f8ff2f5530085f668723cd9c5331a58bdb803513d41418 WHIRLPOOL 20994f3b9a16cd7dd2929ddc684910a7904130b1bcc8fc9a5e1e5f62381112a57cadc6f3ae95bbcd5c5fa0aa4050f6c879ceaf648b91ce6d44508acc8dbc98a8
+MISC ChangeLog 8025 SHA256 04c9b2b53016b1f3704e7b3b3c20149411a861054d16ab985b8b1df77ef0abe8 SHA512 1b38bdbd882c910e5127c2bbffd337c485415c82dea0f6208742b691e016ec6f058f8dcc0151cda4939527bf835cde83b105885a19c744ffe39a463f9f1d0439 WHIRLPOOL fe46f78161c4ef1637db917689a30f8ed0b4c934ec7c3d071d4305e03088fa387fd6d3e9f2565a16db659b70c96c8931ad60391a148bef8b0e46a8eafd864fd0
 MISC metadata.xml 252 SHA256 146feba7b264cf8f998b6165a90d21809d3deece79499756ac057dcaed33a99f SHA512 b2223abf88871df181cb5c98611f42b4dd14969ffad2c618ed57fbce67b8c99c9c90a93838bf5b1bb7fcef34a7b0b150b0a69993bc8844ef5b20687ef319e0a8 WHIRLPOOL 9e9c42c19eb6f2207dff4231d758da4cb380143647d28ecc37c891ff7c53b6c464b26fac7a8812f1949c8b4e43f15cf5b677970a510de37644647f75be23d61b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVfxxUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVgYanXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMTUP/1G9J6c2+LpLcjcBu8L3nYgQ
-IvNVjvQHeG87DoX/aFgX6fkAgrgRh/j1dM1ZET5y4PK1Y0ckKTnpvNscPsuBf8vx
-0goMdwSr7svoKpdfDCa/8fPpRbZTma0HTgjlcuvs0DSGMjouO7mJW66LkA/MhUYO
-PiSbdva7QqPae1gufqqx5kjKYdjjhNU3U/1f6pvzClee04lYgEtrcBPYqh8b6F/U
-yRwiKc/DdvafVdGBrRvGSiZF3aCawQeU6CGRoKYeRl5SWwS5nw3bqIAP7qkiJB0A
-nUIAH7i6WWZiuTi6RMu5e9Ubds1SYgYyuwB9P3kllorLv9bn9zwOENpzDGJczpfL
-akQJa6CXb3gQ/j8FQ0NlYcpixj8KqTlj1NtLOuFnRA79BdhUpPk4d+3lIwcMflko
-tezEvhXyUTEWPxkiSJN8A8T5VAO0L6a2ppCdV0hkLboVwHzOlqvVnfnQ+nLVzdyS
-H2YFIuoq9wTgX6qE4/ST4xcoXMVhFEiyKzji8NM5WBBgyE5aGcMLKrOJkSxSttR7
-d/NvKUNA9sdauMiR7NuvKD1zWiXA1fB4aP0YtW49gSuN+G7wWE/3aS0opLe9ZboL
-P+Oi0KjNDKbP0PiramiErqjcDDW8ntZ40oK2xTM4adiJtnzOBpcJgFfeZdmJSLUa
-dxSRpxC/8p5qLm1tCP85
-=xW/q
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7iwP/1nSgJikt117aZlBgpI7BfaC
+r16gJMrSqDwnwuLocENbtH6Q5pGxB07yLTne143l9bgUJ1SfgnMH/hf502g4ectf
+M0ExKtHF27qowQJcrjj0EuM4AshO/QaPURWlX5LKX5JbYXEHUVbdfuMUpKXB9fOv
+/xmCVNdemVpQGsLVfKLuGbgPBSA6FCveZoQSxZF8fMcPSJMUtqJdMXeWlsIowiP1
+D173jVLP3AJGyXbD4+xXLNiJPghhnPT6p2BYVSIBXMcpnhATj7okz1aoCkVI5jgP
+cQj0628ivS0SJuAAWIri6j5oM9R+j+R7zau9uUu2shWLfxM0uKjU9rP5xdcsKSyv
+4l4pY+tM6ZCckIveaZYhGI64/pA2cFgxPXT5xV2Pcy2tk+YNgg+QC8JPIPAtGAi4
+5yfZYvtVBqHNPwqqV2yza2K3OyasRUlGU61ajqnMGonNQVBJPgmY+07o8qBRWZvX
+lOlaROFcqSTOPGFzsxbOBknZTqnBkgOnTNI3u4a47ma4G530qAwPs8yvDb+34YGD
+6ysYGjtmHrkfZUC2yjWVlqZnoyv0ere8IFDnk7+8uKdGPrd7VdVWTc+F+t5KQQ80
+RFiQ8bP9KdFSxtwtlX6GQ9hmMhhx10J3/gk9MMvT/mU2M2HHcrbCifYKNE0KeRl5
+vrWUaNZTzHY8eVxwn1Ff
+=UTJK
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild
deleted file mode 100644
index 8f9436203f66..000000000000
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-r1.ebuild,v 1.4 2015/03/28 21:40:24 ago 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
-
-	mv Imakefile_base Imakefile || die
-	epatch "${FILESDIR}"/2.7.5-bundled-lib.patch
-
-	eprefixify Imakefile
-
-	xmkmf -DGTKWIN ${myconf} || 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
-}
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
index 060eb362e4a7..b9b7a1000c0c 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild,v 1.2 2015/06/17 14:39:33 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz"
 
 LICENSE="|| ( GPL-2 RASLIC )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
@@ -67,6 +67,19 @@ src_prepare() {
 
 	eprefixify Imakefile
 
+	sed \
+		-e 's:vector.c:v_ector.c:g' \
+		-e 's:vector.o:v_ector.o:g' \
+		-e 's:vector.h:v_ector.h:g' \
+		-i *akefile* || die
+
+	sed \
+		-e 's:vector.h:v_ector.h:g' \
+		-i *.c *.h || die
+
+	mv vector.c v_ector.c || die
+	mv vector.h v_ector.h || die
+
 	xmkmf -DGTKWIN || die "xmkmf failed with ${myconf}"
 }