summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-11-14 14:47:46 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2016-11-14 14:47:46 +0000
commit47a0dfdec99ff35377880e1fff173b68083a8f8e (patch)
tree42b6483d487e18b237a69050c4481d542a7de1fe
parentBump gentoobrowse-api (diff)
downloadportage-47a0dfdec99ff35377880e1fff173b68083a8f8e.tar.bz2
portage-47a0dfdec99ff35377880e1fff173b68083a8f8e.tar.xz
portage-47a0dfdec99ff35377880e1fff173b68083a8f8e.zip
Bump BDR to 1.0.2 patched to 9.6 branched
-rw-r--r--dev-db/bdr/Manifest7
-rw-r--r--dev-db/bdr/bdr-1.0.2.ebuild (renamed from dev-db/bdr/bdr-0.9.3_p2.ebuild)20
-rw-r--r--dev-db/bdr/files/postgresql-9.6.patch.xzbin0 -> 268264 bytes
3 files changed, 19 insertions, 8 deletions
diff --git a/dev-db/bdr/Manifest b/dev-db/bdr/Manifest
index d45fa24..cf4713f 100644
--- a/dev-db/bdr/Manifest
+++ b/dev-db/bdr/Manifest
@@ -1,3 +1,4 @@
-DIST 0.9.3-2.tar.gz 536092 SHA256 d3a5d94a73aa3de75d1e796fd5a1e961e83e30e6c3f273bb5e88ce5775d6312c SHA512 bc5098ed36632ed0c045ca083514cc723141b4a256c85eb761a1014040dbc690045e87c2033069aed50a01e40fb28f1fa052b314d66945dad2135bac630b0fde WHIRLPOOL 48f65b6d3f5706734b80ac3a57ec386388bd0c59090304ba702d84393608eca9a53085c04624ab3b0b6aa3cae6ea8272d761908c06f2d91a39ca396d96dd8885
-DIST postgresql-9.4.5.tar.bz2 17660960 SHA256 b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39 SHA512 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5 WHIRLPOOL 8ea0e9a40cefa53568071f2137bac996898f9bd486cfb5cfcf8bb49590816833f37878f10caabffb9d3127e047f00c916b8830594a485ebe16fb9fe6fc834c95
-EBUILD bdr-0.9.3_p2.ebuild 752 SHA256 7ba87709b6f6a58c36cb51f03d92c9ac09d27bbedf447d193dc0928974da4e92 SHA512 f252b25e357063189a4b4fd23e4378a2a2d41a61a9b1f630079cda8452e58ac1e094db148ee882bd08c967f10f3bdc64c614e87ae60938c3175f32d618432f66 WHIRLPOOL 8ee5e323631e36c013a7f8845b40e26a0105a08e29d930eb2b183e1935d3d990e474c4280ff8abe3dbde34ac8bd30e93641c12127608f5e97d5ee73e1f88fd6e
+AUX postgresql-9.6.patch.xz 268264 SHA256 7c2ece93da2f073bb94d3d72a122678c1f3389aa7eb9329091f5206bd17ad526 SHA512 97746e4e0ada9c7a6887a349ef4ddfd23eeadd0237d7c0036f32e75a349a3ad7a2b7e4f41bb518222fc33a8fd6bbe43210dd0007fa38f59e9031e34bf1f59de0 WHIRLPOOL 79753cfcdca475812562de96693603c4231ca7ffb3755ec7d0e1cd0ee70aeae229a981d1d5dad87e80285b29f2c939171e616793a9cada8e0f841eb098cd0b72
+DIST bdr-1.0.2.tar.gz 582539 SHA256 206a087ba037ecb369aa73ff2910efc0ad0a291385415e2b6efdf0eead5cd3e4 SHA512 e132cffa822d0513022a3ede3eba358ab293b0cb211bfc32d1b4446178dea4f25e630b48c941305d3ead0687d84149546b749a4fdcd4cadd16cc41751250d8f2 WHIRLPOOL 590f407599165ef5276fcac8c95767044e11b29e248525426df3e3ba1ff2f7dca987e5b4eb3f7686a6826797b3680fa0e45cc12c2a44f480ba43dc80102cc90a
+DIST postgresql-9.6.1.tar.bz2 19260568 SHA256 e5101e0a49141fc12a7018c6dad594694d3a3325f5ab71e93e0e51bd94e51fcd SHA512 f27af67f9a96f6327150330bf091a803e10eabbac4e488cf5e4d72907e2eb1dbde7282fe0b89fd75711fd8bdcdb3688b5a9eac1e4d6871f4e8681c9c8b0e7c45 WHIRLPOOL 1ea7933817895ec4ddd531b60eead2c0c3324b90fe48224bd49748d11e76313bb7699670edaf5c8f41b8424026bed59d29aab69208c5ced5161196a4827c78f8
+EBUILD bdr-1.0.2.ebuild 910 SHA256 adfd9a65418ac297263853c4fecbb57c7584feafc6b8665641fe82cc74b47ca6 SHA512 d8112d1f05846c713a9ce68d33714cb472099e63f7310a859fbc6d04058d1eb8f68d25514839286d272316b93b79b8a851410927102e2546a72a922e492bd839 WHIRLPOOL 49d2966e1737cf53fc2a95c061bfe55f90658580c6e48309468fce732d4f0fd482bfa0087989a5447baab3a0b8b180e9e4224e9f14f8f87f263e85199fd8426f
diff --git a/dev-db/bdr/bdr-0.9.3_p2.ebuild b/dev-db/bdr/bdr-1.0.2.ebuild
index bfbbf57..4eb17bb 100644
--- a/dev-db/bdr/bdr-0.9.3_p2.ebuild
+++ b/dev-db/bdr/bdr-1.0.2.ebuild
@@ -4,22 +4,31 @@
EAPI=5
+inherit eutils
+
DESCRIPTION="Bi-Directional Multi-Master Replication (BDR) for PostgreSQL"
HOMEPAGE="http://2ndquadrant.com/en/resources/bdr/"
-SRC_URI="https://github.com/2ndQuadrant/bdr/archive/bdr-plugin/0.9.3-2.tar.gz postgresql-9.4.5.tar.bz2"
+SRC_URI="
+ https://github.com/2ndQuadrant/bdr/archive/bdr-plugin/${PV}.tar.gz -> ${P}.tar.gz
+ postgresql-9.6.1.tar.bz2"
LICENSE=""
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="=dev-db/postgresql-9.4*[server]"
+DEPEND="=dev-db/postgresql-9.6*[server]"
RDEPEND="${DEPEND}"
-bdrS="${WORKDIR}/bdr-bdr-plugin-0.9.3-2"
-pqS="${WORKDIR}/postgresql-9.4.5"
+bdrS="${WORKDIR}/bdr-bdr-plugin-1.0.2"
+pqS="${WORKDIR}/postgresql-9.6.1"
S=${bdrS}
+src_prepare() {
+ cd ${bdrS}
+ epatch ${FILESDIR}/postgresql-9.6.patch.xz
+}
+
src_configure() {
cd ${pqS}
econf
@@ -30,6 +39,7 @@ src_configure() {
src_compile() {
emake -C ${pqS}/src/port
emake -C ${pqS}/src/common
- emake -C ${bdrS} LDFLAGS=-L${pqS}/src/common/\ -L${pqS}/src/port
+ emake -C ${pqS}/src/fe_utils
+ emake -C ${bdrS} LDFLAGS=-L${pqS}/src/common/\ -L${pqS}/src/port\ -L${pqS}/src/fe_utils
}
diff --git a/dev-db/bdr/files/postgresql-9.6.patch.xz b/dev-db/bdr/files/postgresql-9.6.patch.xz
new file mode 100644
index 0000000..ba658c6
--- /dev/null
+++ b/dev-db/bdr/files/postgresql-9.6.patch.xz
Binary files differ