From 1c23a41bd5e03eed5a78883f2255f306054e3816 Mon Sep 17 00:00:00 2001 From: Danny van Dyk Date: Thu, 15 Mar 2007 17:08:43 +0000 Subject: [PATCH] QA: Removed illegal use of ${ROOT}. Bug #168043 Package-Manager: portage-2.1.2.1-r1 --- sci-chemistry/ccp4/ChangeLog | 6 +++++- sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild | 8 ++++---- sci-chemistry/ccp4/ccp4-6.0.2.ebuild | 8 ++++---- sci-chemistry/cns/ChangeLog | 7 +++++-- sci-chemistry/cns/cns-1.1.ebuild | 8 ++++---- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog index dd77a5d8ab2e..4fd0bb01e486 100644 --- a/sci-chemistry/ccp4/ChangeLog +++ b/sci-chemistry/ccp4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/ccp4 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.8 2007/01/06 22:24:57 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.9 2007/03/15 17:04:05 kugelfang Exp $ + + 15 Mar 2007; Danny van Dyk ccp4-6.0.1-r1.ebuild, + ccp4-6.0.2.ebuild: + QA: Removed illegal use of ${ROOT}. Bug #168043 06 Jan 2007; Danny van Dyk -ccp4-6.0.1.ebuild: QA: Removed unused versions. diff --git a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild index 2f0b31dc3f17..6d907812c0c8 100644 --- a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild +++ b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.2 2006/09/26 08:01:27 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.3 2007/03/15 17:04:05 kugelfang Exp $ inherit fortran eutils gnuconfig toolchain-funcs @@ -247,11 +247,11 @@ src_install() { # Get rid of S instances # Also the main clipper library is built as libclipper-core, not libclipper sed -i \ - -e "s:${S}:${ROOT}usr:g" \ + -e "s:${S}:usr:g" \ -e "s:lclipper :lclipper-core :g" \ ${S}/bin/clipper-config # sed -i \ -# -e "s:${S}:${ROOT}usr:g" \ +# -e "s:${S}:usr:g" \ # ${S}/$(get_libdir)/cctbx/cctbx_build/setpaths* # Bins diff --git a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild index 092ff624ea02..89fd658ebc7e 100644 --- a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild +++ b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.1 2006/11/24 10:45:41 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.2 2007/03/15 17:04:05 kugelfang Exp $ inherit fortran eutils gnuconfig toolchain-funcs @@ -217,11 +217,11 @@ src_install() { # Get rid of S instances # Also the main clipper library is built as libclipper-core, not libclipper sed -i \ - -e "s:${S}:${ROOT}usr:g" \ + -e "s:${S}:$usr:g" \ -e "s:lclipper :lclipper-core :g" \ ${S}/bin/clipper-config # sed -i \ -# -e "s:${S}:${ROOT}usr:g" \ +# -e "s:${S}:usr:g" \ # ${S}/$(get_libdir)/cctbx/cctbx_build/setpaths* # Bins diff --git a/sci-chemistry/cns/ChangeLog b/sci-chemistry/cns/ChangeLog index 49150f7d621c..25833d4ce123 100644 --- a/sci-chemistry/cns/ChangeLog +++ b/sci-chemistry/cns/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/cns -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.5 2006/09/20 05:08:59 dberkholz Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.6 2007/03/15 17:08:43 kugelfang Exp $ + + 15 Mar 2007; Danny van Dyk cns-1.1.ebuild: + QA: Removed illegal use of ${ROOT}. Bug #168043 20 Sep 2006; Donnie Berkholz ; metadata.xml: (#148281) Change herd to sci-chemistry from sci. diff --git a/sci-chemistry/cns/cns-1.1.ebuild b/sci-chemistry/cns/cns-1.1.ebuild index 0f4219fbb844..e772a65dc1cc 100644 --- a/sci-chemistry/cns/cns-1.1.ebuild +++ b/sci-chemistry/cns/cns-1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.1.ebuild,v 1.2 2006/07/09 07:15:35 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.1.ebuild,v 1.3 2007/03/15 17:08:43 kugelfang Exp $ inherit eutils fortran toolchain-funcs @@ -79,8 +79,8 @@ src_test() { src_install() { # Install to locations resembling FHS sed -i \ - -e "s:${S}:${ROOT}usr:g" \ - -e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_ROOT ${ROOT}usr:g" \ + -e "s:${S}:usr:g" \ + -e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_ROOT usr:g" \ -e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DATA \$CNS_ROOT/share/data:g" \ -e "s:^\(setenv CNS_SOLVE.*\):\1\nsetenv CNS_DOC \$CNS_ROOT/share/doc/${PF}:g" \ -e "s:CNS_MODULE \$CNS_SOLVE/modules:CNS_MODULE \$CNS_DATA/modules:g" \ -- 2.26.2