Updated Debian patch. Keyworded amd64-linux and x86-linux

Package-Manager: portage-2.2.01.21580-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 86 insertions, 22 deletions

diff --git a/sci-physics/paw/ChangeLog b/sci-physics/paw/ChangeLog
index 0cb3231a1376..b242eafe8fb2 100644
--- a/sci-physics/paw/ChangeLog
+++ b/sci-physics/paw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/paw
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.25 2012/10/24 19:43:50 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/ChangeLog,v 1.26 2013/01/17 19:15:39 bicatali Exp $
+
+*paw-2.14.04-r4 (17 Jan 2013)
+
+  17 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +paw-2.14.04-r4.ebuild,
+  metadata.xml:
+  Updated Debian patch. Keyworded amd64-linux and x86-linux
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> paw-2.14.04-r2.ebuild,
   paw-2.14.04-r3.ebuild:
@@ -102,4 +108,3 @@
   24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
   +paw-2.14.04.ebuild:
   Initial import.
-
diff --git a/sci-physics/paw/Manifest b/sci-physics/paw/Manifest
index 53e47356f670..7a61d2de9dd9 100644
--- a/sci-physics/paw/Manifest
+++ b/sci-physics/paw/Manifest
@@ -4,26 +4,18 @@ Hash: SHA256
 AUX paw-2.14.04-glibc-2.10.patch 311 SHA256 a729f58b8d633624340c4ce0eeee453082b6dd8e5b11a2ccc3ac3b286d0b8535 SHA512 b053bedfddf6472d3b8e728b8cac518dd511a1b2ec9e12d7249f0858b3fa9c1214484461217ca4fa8111190c055ad5e69e7ece6b5c7be027f2fd1dfd869f34f7 WHIRLPOOL affcdcb981c40f0c731181bc5e3e1dbd0af9eb37efdd602fe92003722222b629746159664ec43123e7d6cb66679ca5448198cc5b19ab281eff44323db331e033
 AUX paw-2.14.04-missing-headers.patch 271 SHA256 d35e99f8ad9f71da10d7283034920bd731fd5e4f9947d6e2fbd6b19b0fa58046 SHA512 d04f445956449d8a4507c9c913c9db136eb5444d7740cdaea0da191d05c6c62b5502850e53bc23e781fa39487c4ea56f2b6cd2f29f221320e64ff06390675859 WHIRLPOOL e16aafb0c18b9b928f5a957ca25076a751f23349ff5c73be9ed85259c449bf02e0466af980d1c3c7108569c58db1d9e922be2d1a7517a9cc46bad7a49afca6ae
 DIST paw_2.14.04.dfsg.2-6.diff.gz 66142 SHA256 292942fc497469159506f9bfb513ba90c920bdee360c401d7214a5bdd7abffe2
-DIST paw_2.14.04.dfsg.2-7.debian.tar.gz 80210 SHA256 fd6799ebfd5a795609e0ff3ee0028848b724de976e448711fa6d795e6206ee6e
-DIST paw_2.14.04.dfsg.2.orig.tar.gz 3334317 SHA256 68925384706a4a61c477a48ed0fad539d214a4b04fdb9db5ef4e8d453f26c44e
+DIST paw_2.14.04.dfsg.2-7.debian.tar.gz 80210 SHA256 fd6799ebfd5a795609e0ff3ee0028848b724de976e448711fa6d795e6206ee6e SHA512 4d49b5ea07ce66db6fd91bdeef232251173e710fc9155707a29ce52d9665ff42805528fcf7022f95bf5fed42268b187e720b4f683d39d7b188e97316f9942b18 WHIRLPOOL fafa4f5e5a6951c5333a5432aa7ef0a5b067b7cb2cc2eb5074798651ffca38ab0137db5296ce674841bab082ac4b0ad811bc2244a826b752e95001f8810d0f16
+DIST paw_2.14.04.dfsg.2-8.debian.tar.gz 75788 SHA256 1fa912310f5c2eb4cd856fca53808d6142451fc6be4ffa3be14f54195f8e2203 SHA512 63800b6071c0614d3d68eceffc23117703a9e48f6a9da3fd160b2eb27b326ffe7dc38718245d40e713b2c047967233e1aa56e7381754bbc95804b4c208d1d270 WHIRLPOOL 38899fa56f370cc4cbae0d593006a09cee451ecfb97b8d236b18bc4a36bfde7d5c4891a9309bd9e8bad9da8d8ba8691fc77b37f7e48545b989f6b9983e61ab38
+DIST paw_2.14.04.dfsg.2.orig.tar.gz 3334317 SHA256 68925384706a4a61c477a48ed0fad539d214a4b04fdb9db5ef4e8d453f26c44e SHA512 6e4ef312195936b42ad641a63335586f48e0383e8a7f4330d52173492584f9d03c5fa4eab7e7de594e30556a1daacbe162b4f879718c9c489cb7a89f072b962e WHIRLPOOL a1c78a8d66cc10a1014a96d0b276fc0bf0725ff08ed6055ff4be9c194d50d1416ea32bfae32ea18d1b919d03ff2746c0bda29b74c15b2296f211d58086951551
 EBUILD paw-2.14.04-r2.ebuild 2073 SHA256 847730c77e3db8f6cd4cdd83a2737c43ce6604a296b91da0180b5359d2943bc5 SHA512 39b5c77ce816c8d217281391b2ca3c8a214eb5a55aed46a9b724d738f29b705a79b8a90dff3675a02110db58615db3848e9487c62c4c58caf7269908006fce4d WHIRLPOOL a2f04b3a961fe04a5b99c7d4155f76929bfd236d3494fad2ccad4e8c4ca33d5aed5679858f90517da54f1fc10e097ae6af0c2779e4a06fbb7fa8da3c277c24de
 EBUILD paw-2.14.04-r3.ebuild 1811 SHA256 60d3bfb90dff7d2abfb6590531062ac8fb3b0fd00a1bc3b2af954ac6f7fa4ab7 SHA512 823c4ce818bae36d56c5cd28ab792e95522674bfdbafb2883e50fd9138ca4184e3cf25b64ec112ca8948fcd820b3e9fb5539ee5aaf4986d3152f4b0d0d78479b WHIRLPOOL cd4eaea4bac8e07ff06fc46628ea41101815077b7f6029cb5711410660c08088d172ba96b310798a0d44dc2af13765cf6b4ca47d0c0ba89c0ed36e2cc09a8ea6
-MISC ChangeLog 3799 SHA256 ff17824e0e5e964a43ece01d32d9784dbd90152b35503b3640eccba48429fd73 SHA512 251dfecddfc590ca9e3dd77894f7e576d50a4c98e6e39538c374411baed7c3b4307286c20503b1ca45f12c51b0e9b566d7ec2e60b0ad842c2a91d172e9066856 WHIRLPOOL 52cb923b779a328b8262d3d22ac3e25ee98d7a9a7f6e9f44ac689438289dd4a448da714ccf925fc53bd0d0c52e53344740cc94da9cb98680f872750c443580c9
-MISC metadata.xml 690 SHA256 eedc503bd93a9877c83d78a2d0e7b5e0394d662f65fe16e1a6351b7a5f6bb520 SHA512 874b3041795503dc690b4ade1da558a596371e1320475ce652996ea8dbf20ca2c2225210379ac037ff82c6b385959911561a01e9367771c067a47783614f88bf WHIRLPOOL ca1423ff199337284bd4bd6b3ce08b34bfcae243049705d61e92d10785b63899abf51fd960a145384b2a9e996b0bcb4dbc71d59f0a9bc3cdf42ea1215731f0b2
+EBUILD paw-2.14.04-r4.ebuild 1743 SHA256 531d72ae32661f7842b80b6f97411c397211464925e9c763ecd541faa037c54f SHA512 2b943301cfe8cdd537ded03116038d30598de98cba121228a6a1f0d6c1a88c17d28b1c76f1566d40455ea73822521331e9c89b82e6f1f610281fabe1a39bd37a WHIRLPOOL 56223a58018c2033180f398a6ff3dd34341ef2a3cd8ac9b7e4dd321e4e3356071bd89f6844914cf898468db3759b1856f3a2cd5759e41faf815ffbad478a6033
+MISC ChangeLog 3990 SHA256 5f02d4bf56e34bc16ad9e8979fbd3d8d7dffd3e9b0913bffbc42baefd4e2340b SHA512 9676ce36532b751a3e17d50f2886b3e6e73e3cab9162ec481f4d910d76a53d5424a8fbb4a2cb0fbf3ad35f01904273138a58ef3cea1ef6006f021cc4039707b1 WHIRLPOOL 4d7e259f2a09cbedf4d2af5ea45c1e8018e3aadde464bb1055c1a49ba2945fe634c72221b0aae4032e3aafb03a8c2ea336b02cd71f81a43ac41d80e39c6ab892
+MISC metadata.xml 688 SHA256 cbc31d8cbfddf2bee605d85449a887950a5cc7707c1caeb623865caaee2edc11 SHA512 c920a3471c9c3e6564bafe31b5dad588d45be610a5e1be13fad56ce30efca9d76e83ffd6179e56ade08534f2a03278cd20cdeaf7e1be8ffc17679a7af25310c7 WHIRLPOOL 78f428e58854218da53a05c5d7036789c86307b0f2822499a3aed27d0b30b50389ee01d273d755168982fabac6feb161d7d37148028460a6c43c5e52f9a7fe1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiEUCAAoJEDxpGckxwJCBAYsQAJ43r41+Di2WCw7X7o5NZ7WW
-f+0vzIKU2UQofGIGRqhYMbrea9bwMygqWe30QD8Xt/4D7H7gqQOj2qyGYaNRvVQF
-RH/rQC8zyFhC0ATy6n2Ad3yv1TUQaMqsgFQSaRTlwVmy7pzwLceSNIuECQEtdS3E
-Sp2PPjEh/ADJFAiVyePdbekzykqlVZxr29o5qXNmetowU0Xudp+Lt/hxtKGqS2AE
-9RNcffxtkQdcYK9D52EiXUmszgW6hRsUN5hFGqMRxzrgazhVAIVNuBdpCZuMATMT
-5DeqOA0/3lnHUclkMw0I2GeLdX6+LK0SRMX0EX6Wes9/lCnDtO2JlPoSDEOHxnI0
-zcBsE6UWrbRcveSQt7Cs9lSJ8LIVGFDyllqyUR6dlKM4VjPrY1ABvptGJbDVO8b+
-gTtd5eWKBO4X6o2cSGxIF/YZSwPkt0/8D4WWYEcHrdAjikhoBRNyr0t1M/nfC9KV
-cE+Vpassro0xiOC6npNFNotOn61ahb1kUpkKSr+zFWLKr39SK7tlDlDRMAO8EOx4
-5+6v8QZcUrdZ0tL1NaoulcrHi6mhDCfKt+BYOB40R6TTEksh720Xtad9Yo5lZBG8
-bVdAymVMb/t/RT6E3Zt2b5iY1M/BAOmw9drPvbnwtmKvi2fTd17a49JCMWWB2ugN
-Y9QXGQmGGNwAIxZVdqSt
-=so/U
+iEYEAREIAAYFAlD4Td0ACgkQ1ycZbhPLE2CI+wCfdtSjcNrqG+TN7Zch3mG7guCk
+/sYAoLCNa/vqNYE/vSF44DYbYQFW0fxi
+=a2xQ
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/paw/metadata.xml b/sci-physics/paw/metadata.xml
index d3ab764eea38..9450758ff229 100644
--- a/sci-physics/paw/metadata.xml
+++ b/sci-physics/paw/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
+<herd>sci-physics</herd>
+<longdescription lang="en">
   PAW is an interactive program providing interactive graphical
   presentation and statistical and mathematical analysis tools. It is
   designed to work on objects familiar to physicists such as histograms,
diff --git a/sci-physics/paw/paw-2.14.04-r4.ebuild b/sci-physics/paw/paw-2.14.04-r4.ebuild
new file mode 100644
index 000000000000..9c3635aa6706
--- /dev/null
+++ b/sci-physics/paw/paw-2.14.04-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/paw-2.14.04-r4.ebuild,v 1.1 2013/01/17 19:15:39 bicatali Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs fortran-2
+
+DEB_PN=paw
+DEB_PV=${PV}.dfsg.2
+DEB_PR=8
+DEB_P=${DEB_PN}_${DEB_PV}
+
+DESCRIPTION="CERN's Physics Analysis Workstation data analysis program"
+HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/paw/index.html"
+SRC_URI="
+	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
+	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2 BSD"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sci-physics/cernlib
+	x11-libs/libXaw
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae"
+DEPEND="${RDEPEND}
+	dev-lang/cfortran
+	virtual/latex-base
+	x11-misc/imake
+	x11-misc/makedepend"
+
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
+
+src_prepare() {
+	mv ../debian . && cp debian/add-ons/Makefile .
+	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
+
+	# fix some path stuff and collision for comis.h,
+	# already installed by cernlib and replace hardcoded fortran compiler
+	sed -i \
+		-e "s:/usr/local:${EROOT}/usr:g" \
+		-e '/comis.h/d' \
+		-e "s/gfortran/$(tc-getFC)/g" \
+		Makefile || die
+
+	einfo "Applying Debian patches"
+	emake -j1 patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	# since we depend on cfortran, do not use the one from cernlib
+	rm src/include/cfortran/cfortran.h || die
+}
+
+src_compile() {
+	VARTEXFONTS="${T}"/fonts
+	emake -j1 cernlib-indep cernlib-arch
+}
+
+src_install() {
+	default
+	cd debian
+	dodoc changelog README.* deadpool.txt copyright
+	newdoc add-ons/README README.add-ons
+}