diff options
| author |   heracles <heracles@localhost> | 2007-03-07 23:41:18 +0000 |
|---|---|---|
| committer | heracles <heracles@localhost> | 2007-03-07 23:41:18 +0000 |
| commit | 29374c7fe7867f877cf9c4a56a61e6704222cc96 (patch) | |
| tree | 5e533a70b82fc0f8227300bf618220d102ef26b5 /eclass | |
| parent | dev-db/pgadmin3-1.4.3-r1: made it depend on virtual (diff) | |
| download | experimental-29374c7fe7867f877cf9c4a56a61e6704222cc96.tar.gz experimental-29374c7fe7867f877cf9c4a56a61e6704222cc96.tar.bz2 experimental-29374c7fe7867f877cf9c4a56a61e6704222cc96.zip | |
eclasses fixes and improvements
svn path=/experimental/; revision=222
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/postgresql-ext.eclass | 6 | ||||
| -rw-r--r-- | eclass/postgresql.eclass | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/eclass/postgresql-ext.eclass b/eclass/postgresql-ext.eclass index be260ba..fedce0a 100644 --- a/eclass/postgresql-ext.eclass +++ b/eclass/postgresql-ext.eclass @@ -62,11 +62,11 @@ postgresql-ext_pgslot_src_install() { pg_slots_depend() { local vers=( ${POSTGREXT_SLOTS} ) if [[ -z "${vers[0]}" ]] ; then - echo 'dev-db/postgresql-server' + echo 'virtual/postgresql-server' else - echo ">=dev-db/postgresql-${vers[0]}*" + echo ">=virtual/postgresql-server-${vers[0]}*" if [[ ! -z "${vers[1]}" ]] ; then - echo "<=dev-db/postgresql-${vers[1]}*" + echo "<=virtual/postgresql-server-${vers[1]}*" fi fi } diff --git a/eclass/postgresql.eclass b/eclass/postgresql.eclass index 6ae0e27..c655c3a 100644 --- a/eclass/postgresql.eclass +++ b/eclass/postgresql.eclass @@ -69,7 +69,7 @@ postgresql_find_version() { # Returns path to binaries postgresql_get_bindir() { local ver="$(postgresql_find_version "$1" "$2" "$3")" - (. /usr/lib/eselect-postgresql/slots/$ver/libs ; echo $postgres_bindir ) + (for f in /usr/lib/eselect-postgresql/slots/$ver/*; do source $f ; done ; echo $postgres_bindir ) } # Usage: postgresql_get_pgconfig [min_version[ max_version[ strategy]]] @@ -82,10 +82,10 @@ postgresql_get_pgconfig() { # Usage: postgresql_get_bindir_for_slot slot # Returns path to binaries for exact slot postgresql_get_bindir_for_slot() { - (. /usr/lib/eselect-postgresql/slots/$1/libs ; echo $postgres_bindir) + (for f in /usr/lib/eselect-postgresql/slots/$1/* ; do source $f ; done ; echo $postgres_bindir) } # Usage: postgresql_get_pgconfig_for_slot slot # Returns path to pg_config for exact slot postgresql_get_pgconfig_for_slot() { - echo "$(. /usr/lib/eselect-postgresql/slots/$1/libs ; echo $postgres_bindir)/pg_config" + echo "$(for f in /usr/lib/eselect-postgresql/slots/$1/* ; do source $f ; done ; echo $postgres_bindir)/pg_config" } |