Keyworded for ~x86-linux ~amd64-linux

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 24 insertions, 14 deletions

diff --git a/sci-chemistry/pdb-extract/ChangeLog b/sci-chemistry/pdb-extract/ChangeLog
index d4e35b56c6d8..07d06ebe1b13 100644
--- 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/files/pdb-extract-3.004-Makefile.patch b/sci-chemistry/pdb-extract/files/pdb-extract-3.004-Makefile.patch
index 6e3ed5e14339..3a6f5498ffba 100644
--- 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 513cb71ba351..1b60778ce97c 100644
--- 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 51b39dda6f7f..b76bafd7c19a 100644
--- 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"
 }