summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-db/bdr-plugin/Manifest4
-rw-r--r--dev-db/bdr-plugin/bdr-plugin-1.0.2.ebuild32
-rw-r--r--dev-db/bdr-plugin/files/32bit.patch (renamed from dev-db/bdr/files/32bit.patch)0
-rw-r--r--dev-db/bdr-plugin/files/postgresql-9.6.patch.xz (renamed from dev-db/bdr/files/postgresql-9.6.patch.xz)bin268264 -> 268264 bytes
-rw-r--r--dev-db/bdr/Manifest5
-rw-r--r--dev-db/bdr/bdr-1.0.2.ebuild46
6 files changed, 36 insertions, 51 deletions
diff --git a/dev-db/bdr-plugin/Manifest b/dev-db/bdr-plugin/Manifest
new file mode 100644
index 0000000..8f23362
--- /dev/null
+++ b/dev-db/bdr-plugin/Manifest
@@ -0,0 +1,4 @@
+AUX 32bit.patch 430 SHA256 cdd027a7554e15781b23caaa6acb05e50b2853a2e6f8d1e46a40fb9105e720af SHA512 cb54fc66e5d4ad8396849b35a02c0bac9fb120ba4dd18fc2483f9b9a52bca21812c4561572b39bf2e3f8f175bbb256a540e89322cb2a333a41b4368b2321d7ec WHIRLPOOL 9362755302d1eb976a3cf6ae281cb5684bcd708db8343418409275fbce3e5ad1837ae72f98930deac2e86c54d94937e81cc85d40e1ea0540d7328c3eab93e541
+AUX postgresql-9.6.patch.xz 268264 SHA256 7c2ece93da2f073bb94d3d72a122678c1f3389aa7eb9329091f5206bd17ad526 SHA512 97746e4e0ada9c7a6887a349ef4ddfd23eeadd0237d7c0036f32e75a349a3ad7a2b7e4f41bb518222fc33a8fd6bbe43210dd0007fa38f59e9031e34bf1f59de0 WHIRLPOOL 79753cfcdca475812562de96693603c4231ca7ffb3755ec7d0e1cd0ee70aeae229a981d1d5dad87e80285b29f2c939171e616793a9cada8e0f841eb098cd0b72
+DIST bdr-plugin-1.0.2.tar.gz 958108 SHA256 ef182ed052415d380630ab88cee0829c5d721a338f54de64461c88719e32afcf SHA512 8a9b5be014d7c41dc53bf8d21cdf44d667a5a8f7f6e988f13b8a9d44677ff3139d766d60c8fe5fad959c46bc4b618cf8b8a9ff538d9d6b01786bd57ef23dddf4 WHIRLPOOL fabb1d1505f41f28815a37f167faaf298a4fff225ca9658c9c6dfe70219f804711cea2c21c4a4910ce18992cfbeb11ee8cefe01429d51393eedac7c7cdacec21
+EBUILD bdr-plugin-1.0.2.ebuild 667 SHA256 b17f283b519852c5c5f6f9359ee502de1f98225fe04ab66396aedcf6458db2f7 SHA512 4750aef361f16bc4bc796c02db5872c730f1f9bc88e21d7900848f785a38780af23b46124ce28a9aa13d179008f3d6b0aa5f86a9f4de999b5df1438f6ac48fc4 WHIRLPOOL f64173a91f31af84897071059a03ba81bbd36009767e7c070a777d1fdae2891f6afab45d395081daafcfbdb6bd4d5543c43e38d66fc8da0e645090eef6c16a32
diff --git a/dev-db/bdr-plugin/bdr-plugin-1.0.2.ebuild b/dev-db/bdr-plugin/bdr-plugin-1.0.2.ebuild
new file mode 100644
index 0000000..a5e3f22
--- /dev/null
+++ b/dev-db/bdr-plugin/bdr-plugin-1.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Bi-Directional Multi-Master Replication (BDR) for PostgreSQL"
+HOMEPAGE="http://2ndquadrant.com/en/resources/bdr/"
+# 1.0.2 from dev-bdr96
+COMMIT=80af2ab71121b3d2332560f59ffabd8a4d05b0ab
+SRC_URI="https://github.com/2ndQuadrant/bdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=dev-db/postgresql-9.6*[server,static-libs]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/bdr-${COMMIT}"
+
+src_prepare() {
+ epatch ${FILESDIR}/32bit.patch
+}
+
+src_compile() {
+ emake USE_PGXS=1
+}
+
diff --git a/dev-db/bdr/files/32bit.patch b/dev-db/bdr-plugin/files/32bit.patch
index d8c34a2..d8c34a2 100644
--- a/dev-db/bdr/files/32bit.patch
+++ b/dev-db/bdr-plugin/files/32bit.patch
diff --git a/dev-db/bdr/files/postgresql-9.6.patch.xz b/dev-db/bdr-plugin/files/postgresql-9.6.patch.xz
index ba658c6..ba658c6 100644
--- a/dev-db/bdr/files/postgresql-9.6.patch.xz
+++ b/dev-db/bdr-plugin/files/postgresql-9.6.patch.xz
Binary files differ
diff --git a/dev-db/bdr/Manifest b/dev-db/bdr/Manifest
deleted file mode 100644
index f190293..0000000
--- a/dev-db/bdr/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 32bit.patch 430 SHA256 cdd027a7554e15781b23caaa6acb05e50b2853a2e6f8d1e46a40fb9105e720af SHA512 cb54fc66e5d4ad8396849b35a02c0bac9fb120ba4dd18fc2483f9b9a52bca21812c4561572b39bf2e3f8f175bbb256a540e89322cb2a333a41b4368b2321d7ec WHIRLPOOL 9362755302d1eb976a3cf6ae281cb5684bcd708db8343418409275fbce3e5ad1837ae72f98930deac2e86c54d94937e81cc85d40e1ea0540d7328c3eab93e541
-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 942 SHA256 871d7cf203871b9ae5a198f13928eb02712c18a8a1c6d8eb18b3ea29ca9992b3 SHA512 f3eccce201766bb16b769c84cd6b940b30f6b42e3ca263736ec296a03db0e2c98826af4981a5a913aaeed3ca29d1715cc517d902bc3771786b89f1c9235a54fe WHIRLPOOL 05a9bd9a1ed1bc0bc076a115528a9e01eb794b8f29c2f913717aab7fe6ef02c5adec988b3caea4c418c383e274b3057fead01220a3bef985543595d31f2e0a4d
diff --git a/dev-db/bdr/bdr-1.0.2.ebuild b/dev-db/bdr/bdr-1.0.2.ebuild
deleted file mode 100644
index e9d70c6..0000000
--- a/dev-db/bdr/bdr-1.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/${PV}.tar.gz -> ${P}.tar.gz
- postgresql-9.6.1.tar.bz2"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=dev-db/postgresql-9.6*[server]"
-RDEPEND="${DEPEND}"
-
-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
- epatch ${FILESDIR}/32bit.patch
-}
-
-src_configure() {
- cd ${pqS}
- econf
- cd ${bdrS}
- econf
-}
-
-src_compile() {
- emake -C ${pqS}/src/port
- emake -C ${pqS}/src/common
- emake -C ${pqS}/src/fe_utils
- emake -C ${bdrS} LDFLAGS=-L${pqS}/src/common/\ -L${pqS}/src/port\ -L${pqS}/src/fe_utils
-}
-