Keyworded for ~x86-linux ~amd64-linux

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/pdb-extract/ChangeLog b/sci-chemistry/pdb-extract/ChangeLog
index d4e35b56c6d8e621a2833080cfe1b87d7e036cfe..07d06ebe1b13cc636cc72b341f4401b8a7755f4a 100644 (file)
--- a/sci-chemistry/pdb-extract/ChangeLog
+++ b/sci-chemistry/pdb-extract/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pdb-extract
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/ChangeLog,v 1.12 2010/02/10 08:17:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/ChangeLog,v 1.13 2010/04/05 19:47:02 jlec Exp $
+
+  05 Apr 2010; Justin Lecher <jlec@gentoo.org> pdb-extract-3.004.ebuild,
+  files/pdb-extract-3.004-Makefile.patch,
+  files/pdb-extract-3.004-cflags-install.patch:
+  Keyworded for ~x86-linux ~amd64-linux, tested by me
 
   10 Feb 2010; Torsten Veller <tove@gentoo.org> pdb-extract-3.004.ebuild:
   Add missing die: || "..." -> || die "..."

diff --git a/sci-chemistry/pdb-extract/Manifest b/sci-chemistry/pdb-extract/Manifest
index 394c7d72af2e7100783c9772828f0fb65e2ce581..eb7d6afb1e5dc81c07ac2a446f8d6b313901034b 100644 (file)
--- a/sci-chemistry/pdb-extract/Manifest
+++ b/sci-chemistry/pdb-extract/Manifest
@@ -1,11 +1,21 @@
-AUX pdb-extract-3.004-Makefile.patch 1506 RMD160 0462c70948aa2f87f519b33e91f4cc14104ccfad SHA1 1f9a951d0d41a368430d39acd0bac8e293fbb554 SHA256 6f7c4d1c60b33a9c1d13e49d30973d67291a2e005012f0379c20ab8e5dea8bb1
-AUX pdb-extract-3.004-cflags-install.patch 7056 RMD160 2c33a9ce727d26b8c64c8788770d5aa7762669b2 SHA1 903c6743a81aa5fee0b87540542403cb0d3cfc31 SHA256 a71dc936c47e4494790ec938df9a51338f78307abf9cf3b40ad8f1e84a3a74fd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pdb-extract-3.004-Makefile.patch 1530 RMD160 ba4b642e37c26643dd682288f16db6fa9178cd6d SHA1 d50fb483a835a0a2c98e8306050fbfa10bbc6ef8 SHA256 b1e30c706e90757c436617af595e1dd79e3eb79e3e7449ef64dee757ebb04db7
+AUX pdb-extract-3.004-cflags-install.patch 7152 RMD160 0ac4d82a1f28de08b43de08d4b9b561127e5349f SHA1 0346fe25f34d24c7d5203004db9099f119fba0d1 SHA256 611cda282824d7d780750dacc8c516a73046e55b18daecc5f6588c1c5d84e60b
 AUX pdb-extract-3.004-env.patch 501 RMD160 6698680915a9e585f7a8c4d266f5c644e3229ce0 SHA1 ccc2371360fb6da39a6370132764ee97952387b1 SHA256 ccba5db2e3e6eb18465c62b795635ea4ecfbd6695f36376bc298132f986dd8ff
 AUX pdb-extract-3.004-gcc-4.3.patch 573 RMD160 a9d563b1834bf6293568793a1895026f5b5b9d39 SHA1 bc726c4461ead9faae1694eff53603726d53d91a SHA256 e92f42fb84198e8b543edc364565804f61fbb440da03103506bcb6e6848750ed
 AUX respect-cflags-and-fix-install.patch 8415 RMD160 b1418278385f197db26a49be4bf1ad2bbed4b4c0 SHA1 93bd785a4683542716309d917335de7a9c3573d4 SHA256 ab44177b9a9e34573331aafeb112efa86154a0c1ee706930aa05c32c0eb1e58b
 DIST pdb-extract-v1.700-prod-src.tar.gz 9081548 RMD160 c565de9af1cea09ccf0bd59527191fc76a4b7aa1 SHA1 27eedd1d46e95e7006c90694e379bdcb4f20fd92 SHA256 b35d2bf5d7f96580782a3645ab288aec1be21926bf52969f4de74d4f514a471c
 DIST pdb-extract-v3.004-prod-src.tar.gz 942450 RMD160 3d5d46e668a52109678fdf59afbe664dac1643f9 SHA1 7b5d7ce200d33e68fa352cd3658e382bc37e9768 SHA256 58bef2aba4869cdd16a79ddc588da5596a2ccd1f5c925f300b63b6d8299bb953
 EBUILD pdb-extract-1.700.ebuild 1457 RMD160 367b396727c4543fc192844f0361ddfed990424a SHA1 f27617cae26aa6e24284de3cb496d807ba1272f8 SHA256 29e7b728dab5a47bba11eafb034c5d9fd4323660af4404782990879c85e538fb
-EBUILD pdb-extract-3.004.ebuild 2282 RMD160 75f712bae0df5ab6c5269d8a97134b4c176b9d33 SHA1 836e6c420976230e815a53655f581ee653eb9a5c SHA256 e85294f0df193b17e96ddadb2e4ff91da2f5f201cc8ebccd643f620b2d280408
-MISC ChangeLog 2054 RMD160 de150bcc7d210500703a26921a29fb64a21a06fd SHA1 05b2ddb7aa7d6d8848449da3cd8b0ae44611197d SHA256 fa38c811d687cf6458c36a1fa7ecc0e3840c5c748a40bea34d2d300b41f6b8cb
+EBUILD pdb-extract-3.004.ebuild 2401 RMD160 381e1eacc106dd2757e4d0a8b5b1a589ff976e48 SHA1 b289b514af002c7f9b9b4b975fb84592741603b2 SHA256 f549c44bcad4d57f468b1faea6480473b52337725000510bae925dacbe41d30a
+MISC ChangeLog 2272 RMD160 f08e2a1eca086168e3c9f1125ee279e3bc4012e7 SHA1 10860dae04e396c2d2e09a06ef886bd819b4ea99 SHA256 51f7c2a8ef2f441c96ab8ed3002829a6332bdbe36c10c8f00441c1a43b30cd9f
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku6PjsACgkQgAnW8HDreRb3WQCcDyKm/E3m7ZnHEgKtsPpQH7sY
+4eYAnR8cszDjHxayLiiKTtE3k3Bu1sqB
+=IWti
+-----END PGP SIGNATURE-----

diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch
index 6e3ed5e14339ff57fbe331c5b5567ea129814650..3a6f5498ffba36e344e7fa4c8401de3c54f283cf 100644 (file)
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch
+++ b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch
@@ -21,7 +21,7 @@
  
  M_INCL_DIR = ../include
  M_LIB_DIR  = ../lib
-+M_LIB_DIR_GENTOO = /usr/GENTOOLIBDIR
++M_LIB_DIR_GENTOO = @GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
  M_BIN_DIR  = ../bin
  
  PROJ_DIR   = .

diff --git a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch
index 513cb71ba351016d4ba113fe7cee3f82d6c09a2e..1b60778ce97c4e338bdb9e56f6a500bc31fd1056 100644 (file)
--- a/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch
+++ b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-cflags-install.patch
@@ -18,7 +18,7 @@ diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.darwin3 pdb-extract-v3.
  
  ## Global include directories
 -GINCLUDES= 
-+GINCLUDES=-I/usr/include/cifparse-obj
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
  
  # Collect all include directories from global include directories and
  # include directories specified in module makefile
@@ -39,7 +39,7 @@ diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.darwin4 pdb-extract-v3.
  
  ## Global include directories
 -GINCLUDES= 
-+GINCLUDES=-I/usr/include/cifparse-obj
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
  
  # Collect all include directories from global include directories and
  # include directories specified in module makefile
@@ -69,7 +69,7 @@ diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.gnu3 pdb-extract-v3.004
  
  ## Global include directories
 -GINCLUDES= 
-+GINCLUDES=-I/usr/include/cifparse-obj
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
  
  # Collect all include directories from global include directories and
  # include directories specified in module makefile
@@ -146,7 +146,7 @@ diff -Naur pdb-extract-v3.004-prod-src/etc/make.platform.gnu4 pdb-extract-v3.004
  
  ## Global include directories
 -GINCLUDES= 
-+GINCLUDES=-I/usr/include/cifparse-obj
++GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
  
  # Collect all include directories from global include directories and
  # include directories specified in module makefile

diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.004.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.004.ebuild
index 51b39dda6f7f65bfea4fd268d626fbc0092d131f..b76bafd7c19a484016fdcb3a0765095f71541e58 100644 (file)
--- a/sci-chemistry/pdb-extract/pdb-extract-3.004.ebuild
+++ b/sci-chemistry/pdb-extract/pdb-extract-3.004.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/pdb-extract-3.004.ebuild,v 1.2 2010/02/10 08:17:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/pdb-extract-3.004.ebuild,v 1.3 2010/04/05 19:47:02 jlec Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils toolchain-funcs multilib
 
 MY_P="${PN}-v${PV}-prod-src"
+
 DESCRIPTION="Tools for extracting mmCIF data from structure determination applications"
 HOMEPAGE="http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html"
 SRC_URI="http://sw-tools.pdb.org/apps/PDB_EXTRACT/${MY_P}.tar.gz"
+
 LICENSE="PDB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
+
 RDEPEND="!<app-text/html-xml-utils-5.3"
 DEPEND="${RDEPEND}
        >=sci-libs/cifparse-obj-7.025"
@@ -39,10 +42,12 @@ src_prepare() {
        sed -i \
                -e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \
                -e "s:^\(CC=\).*:\1$(tc-getCC):g" \
-               -e "s:^\(GINCLUDES=\).*:\1-I/usr/include/cifparse-obj:g" \
-               -e "s:^\(LIBDIR=\).*:\1/usr/$(get_libdir):g" \
+               -e "s:^\(GINCLUDES=\).*:\1-I${EPREFIX}/usr/include/cifparse-obj:g" \
+               -e "s:^\(LIBDIR=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
                "${S}"/etc/make.* \
                || die "Failed to fix makefiles"
+
+       eprefixify pdb-extract-v3.0/Makefile etc/*
 }
 
 src_compile() {
@@ -66,8 +71,8 @@ src_install() {
                || die "failed to install data files"
 
        cat >> "${T}"/envd <<- EOF
-       PDB_EXTRACT="/usr/lib/rcsb/"
-       PDB_EXTRACT_ROOT="/usr/"
+       PDB_EXTRACT="${EPREFIX}/usr/lib/rcsb/"
+       PDB_EXTRACT_ROOT="${EPREFIX}/usr/"
        EOF
 
        newenvd "${T}"/envd 20pdb-extract \
@@ -75,5 +80,5 @@ src_install() {
 }
 
 pkg_postinst() {
-       ewarn "We moved extract to extract-pdb due to multiple collision of /usr/bin/extract"
+       ewarn "We moved extract to extract-pdb due to multiple collision of ${EROOT}usr/bin/extract"
 }