diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-06-12 12:33:43 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-06-12 12:33:43 +0000 |
| commit | 55855122008628e64954013458af60350dc87ff9 (patch) | |
| tree | 6ebec46838ac91c3d559b994a97435d3e27542c7 /dev-db | |
| parent | version bump (diff) | |
| download | gentoo-2-55855122008628e64954013458af60350dc87ff9.tar.gz gentoo-2-55855122008628e64954013458af60350dc87ff9.tar.bz2 gentoo-2-55855122008628e64954013458af60350dc87ff9.zip | |
File collision fix for #473054
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/postgresql-server/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild (renamed from dev-db/postgresql-server/postgresql-server-9.3_beta1.ebuild) | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog index a5e71ba73b2e..e3901be92084 100644 --- a/dev-db/postgresql-server/ChangeLog +++ b/dev-db/postgresql-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/postgresql-server # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.258 2013/06/12 01:27:17 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.259 2013/06/12 12:33:43 patrick Exp $ + +*postgresql-server-9.3_beta1-r1 (12 Jun 2013) + + 12 Jun 2013; Patrick Lauer <patrick@gentoo.org> + +postgresql-server-9.3_beta1-r1.ebuild, -postgresql-server-9.3_beta1.ebuild: + File collision fix for #473054 *postgresql-server-9.3_beta1 (12 Jun 2013) diff --git a/dev-db/postgresql-server/postgresql-server-9.3_beta1.ebuild b/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild index d573a715a869..ebae5e11d13b 100644 --- a/dev-db/postgresql-server/postgresql-server-9.3_beta1.ebuild +++ b/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.3_beta1.ebuild,v 1.1 2013/06/12 01:27:17 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild,v 1.1 2013/06/12 12:33:43 patrick Exp $ EAPI="5" @@ -137,6 +137,12 @@ src_install() { emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed" done + # Avoid file collision with -base. + local l + for l in lib lib32 lib64 ; do + rm "${ED}/usr/${l}/postgresql-${SLOT}/${l}/libpgcommon.a" + done + dodir /etc/eselect/postgresql/slots/${SLOT} echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \ "${ED}/etc/eselect/postgresql/slots/${SLOT}/server" |