diff options
| author |   heracles <heracles@localhost> | 2007-02-05 23:04:09 +0000 |
|---|---|---|
| committer | heracles <heracles@localhost> | 2007-02-05 23:04:09 +0000 |
| commit | c017aa0e2c425f2ab645c2b63a185b3d73b4920b (patch) | |
| tree | 25738097b34ba7a9a7dfb0f3b8371fb001a2f599 /app-admin | |
| parent | =dev-db/postgresql-docs-8.{1,2}*: do not try to install unexistent files (diff) | |
| download | experimental-c017aa0e2c425f2ab645c2b63a185b3d73b4920b.tar.gz experimental-c017aa0e2c425f2ab645c2b63a185b3d73b4920b.tar.bz2 experimental-c017aa0e2c425f2ab645c2b63a185b3d73b4920b.zip | |
app-admin/eselect-postgresql: use proper libdir in multilib settings
svn path=/experimental/; revision=196
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/eselect-postgresql/Manifest | 16 | ||||
| -rw-r--r-- | app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/eselect-postgresql/files/postgresql.eselect | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/app-admin/eselect-postgresql/Manifest b/app-admin/eselect-postgresql/Manifest index 3e1337e..0f90baf 100644 --- a/app-admin/eselect-postgresql/Manifest +++ b/app-admin/eselect-postgresql/Manifest @@ -2,14 +2,14 @@ AUX binwrapper 515 RMD160 774f14cc09d6534800e91845e2c4b40b9911af11 SHA1 b9598d62 MD5 5f952f5a5b44bdc6f6cbc4381f6eee86 files/binwrapper 515 RMD160 774f14cc09d6534800e91845e2c4b40b9911af11 files/binwrapper 515 SHA256 99d4774e841f0057fdbf141b9b123975939eac1e5ab6e711d08c44b4adc2b4d1 files/binwrapper 515 -AUX postgresql.eselect 5407 RMD160 886563215499bade06896b07d36a3f74e404aaf3 SHA1 f6c5e8f879f99fbfa2344d7d45425b14ca02cdc7 SHA256 d13ce6c0ebe109a419d37d102c9de398b540cc2a689e195c71411140b43dd07f -MD5 27fb0a10e0d67d53b9b76ae7318527d1 files/postgresql.eselect 5407 -RMD160 886563215499bade06896b07d36a3f74e404aaf3 files/postgresql.eselect 5407 -SHA256 d13ce6c0ebe109a419d37d102c9de398b540cc2a689e195c71411140b43dd07f files/postgresql.eselect 5407 -EBUILD eselect-postgresql-0.1.ebuild 632 RMD160 4f674b8c09476093dc279cf484b8f71a8ca4763d SHA1 e0ec96d74226809f1509a70c49e0d2bc96d43fb8 SHA256 e8c191b85bac0b3080064858454efaa6609b8df86b119f705ec766220322a492 -MD5 b778ac78e9e02950710217ef0f941957 eselect-postgresql-0.1.ebuild 632 -RMD160 4f674b8c09476093dc279cf484b8f71a8ca4763d eselect-postgresql-0.1.ebuild 632 -SHA256 e8c191b85bac0b3080064858454efaa6609b8df86b119f705ec766220322a492 eselect-postgresql-0.1.ebuild 632 +AUX postgresql.eselect 5469 RMD160 a64c9554fd896c7655623b17f2c591ecc5b495f9 SHA1 622c9fcb1e40c0ca7bf7246ee006e36c3566f393 SHA256 2fb606f2e67c188c34b6bd8aa40c87c67728e76c02cc0a34c801fd22de42ca01 +MD5 47b432408274444ac6d4f7ed7ea3cfa6 files/postgresql.eselect 5469 +RMD160 a64c9554fd896c7655623b17f2c591ecc5b495f9 files/postgresql.eselect 5469 +SHA256 2fb606f2e67c188c34b6bd8aa40c87c67728e76c02cc0a34c801fd22de42ca01 files/postgresql.eselect 5469 +EBUILD eselect-postgresql-0.1.ebuild 763 RMD160 335fbc42af875fd17a4c39a3b364a20624312aa7 SHA1 bca26b5746098990c80bfd80e525ca65a2a38446 SHA256 6d964c87ce7fa8809102f5e14034e81d024855d07b62b254a5ec306f19524f76 +MD5 c462981b1c7320f45bc486d057fe1e14 eselect-postgresql-0.1.ebuild 763 +RMD160 335fbc42af875fd17a4c39a3b364a20624312aa7 eselect-postgresql-0.1.ebuild 763 +SHA256 6d964c87ce7fa8809102f5e14034e81d024855d07b62b254a5ec306f19524f76 eselect-postgresql-0.1.ebuild 763 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-postgresql-0.1 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-postgresql-0.1 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-postgresql-0.1 0 diff --git a/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild index e4ac818..a6d4c96 100644 --- a/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild +++ b/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +inherit multilib + DESCRIPTION="Utility to change the default postgresql installation" HOMEPAGE="http://www.gentoo.org/" SRC_URI="" @@ -17,6 +19,8 @@ src_install() { keepdir /etc/eselect/postgresql insinto /usr/share/eselect/modules doins ${FILESDIR}/postgresql.eselect + dosed "s,alibdir='/usr/lib/',alibdir='/usr/$(get_libdir)/',g" \ + /usr/share/eselect/modules/postgresql.eselect exeinto /usr/lib/${PN} doexe ${FILESDIR}/binwrapper dosym /usr/bin/eselect /usr/bin/postgresql-config diff --git a/app-admin/eselect-postgresql/files/postgresql.eselect b/app-admin/eselect-postgresql/files/postgresql.eselect index 13ab15d..196aba5 100644 --- a/app-admin/eselect-postgresql/files/postgresql.eselect +++ b/app-admin/eselect-postgresql/files/postgresql.eselect @@ -59,6 +59,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) } do_set() { + local alibdir='/usr/lib/' [[ ${#@} -ne 1 ]] && die -q "Only one parameter is expected" local slotdir="/usr/lib/eselect-postgresql/slots/${1}" [[ -d "${slotdir}" ]] || die -q "No such version installed" @@ -76,7 +77,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) for l in ${pglibdir}/lib*.{a,so} ; do local bn=$(basename $l) postgres_symlinks[slinks++]="$l" - postgres_symlinks[slinks++]="/usr/lib/$bn" + postgres_symlinks[slinks++]="${alibdir}${bn}" done for (( i=0;i<slinks;i++ )); do local s=${postgres_symlinks[i++]}; @@ -112,6 +113,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) } do_reset() { + local alibdir='/usr/lib/' if [[ -d "$(canonicalise /etc/eselect/postgresql/active)" ]] ; then unset postgres_symlinks unset postgres_bindir @@ -138,7 +140,7 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) for l in ${pglibdir}/lib*.{a,so} ; do local bn=$(basename $l) postgres_symlinks[slinks++]="$l" - postgres_symlinks[slinks++]="/usr/lib/$bn" + postgres_symlinks[slinks++]="${alibdir}${bn}" done for (( i=0;i<slinks;i++ )); do local s=${postgres_symlinks[i++]}; |