commit: df2866534312dfa37457f85b2760f0a96aad01b2 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> AuthorDate: Mon Apr 20 15:54:27 2015 +0000 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> CommitDate: Mon Apr 20 15:54:27 2015 +0000 URL: https://gitweb.gentoo.org/dev/ultrabug.git/commit/?id=df286653
handle systemd unit, use PATCHES and DOCS from base eclass dev-db/aerospike-server-community/Manifest | 2 +- .../aerospike-server-community-3.5.8-r1.ebuild | 18 ++++++++++++++---- dev-python/aerospike/Manifest | 2 +- dev-python/aerospike/aerospike-1.0.42.ebuild | 4 ++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest index ed88421..1a0e6cf 100644 --- a/dev-db/aerospike-server-community/Manifest +++ b/dev-db/aerospike-server-community/Manifest @@ -5,5 +5,5 @@ AUX aerospike.logrotate 191 SHA256 2984ecf6a19f08cea0ee4fdad725922f29b3b878df747 AUX aerospike_mesh.conf 1476 SHA256 27cd3b9304c5af4855ca1edea949b471e209d1402a27a15044b59f7329624572 SHA512 a7d5e52738a3153b649cc81d8a9b635b70fe21335802f5c2f348fe71f3b7087ea85aaf926c4ad3ce71514fa1b479f98bc27aadb95995a5bbb8808219bcbe28c4 WHIRLPOOL 27209abe9aae485e8a540dd6b4563d38c43d8e9a19f2c97e41ca7c995349b7c8f1abcef08e0a92f38431d4fe919838eb6442990201bd3506cc5126e37b92f2d1 AUX aerospike_ssd.conf 1341 SHA256 11dbbffdea382e30d606c4564a577e0657f3ff87f37156f5169806d52acdb711 SHA512 0382842d4e7b20caaa4c39d999da0cd2b67c24bdd9fad6e5d2d393758b6f788decf0039ae9a262a4db7e89b358cbb9954efd082a15549d12e3e244b2c51675c9 WHIRLPOOL 2aa9230d6d1b477aad21b81f6760a915d15bbd51499512a618a1a0dd24342eb9ed0d46cbe0318885a6c446433bd009641adad5fa5e2fdf34e15138ffcabb1f84 DIST aerospike-server-community-3.5.8-debian7.tgz 8358739 SHA256 b7832823a03d827ba78bc91480f86edbb285b377b9f170d352cbc811ce6a2d51 SHA512 e2e0c9a39bfdcc09143eae2dd73bd7cf9734dff2824f56b4ad8852ea95f8d365e43b7e1310ec6e52c4db08b718c861edd391a1e0234f9c318f6a298ec4615e17 WHIRLPOOL d76c808845ce736abe42b7d12f603d0d88e1bd4cbbd9188d6b65b19d78f615d25dafafc77a936f83eb5a0533eee86610eb6b84b0b9df49a4c6f22c0c4ef02068 -EBUILD aerospike-server-community-3.5.8-r1.ebuild 1844 SHA256 85008c95c4c2553bf600828cce2dadabff98e87e2c02d957a4cfaa4a6eb74b31 SHA512 7cc045d76b924e3e3f78690a3b171f3afaaae1534f0d47f154f247455f61dc857ba381ecde8d38aa8e1c661775be42dd9ed06522cbe19fb6509fe328932ef3c5 WHIRLPOOL 7fd9baa9dc52b13db6f50503004258c89aead4cc265096cf2efa19a0d85a65fed8899e826e2df581ae41ef7dbfdfe6a9809059da7bdebf35eaa73724f9d979cb +EBUILD aerospike-server-community-3.5.8-r1.ebuild 1981 SHA256 311442d981b1c4858936d8cb0c74fd5a196534b86a3f8acfabea8b75934d970e SHA512 7516527ad647c6502296960f86e01a424fd47e3cd7a35a1bf11bbe64bfaa4b9651bd2abde7143d476b0530ff7e0481794d2af87a5ef16238dd4fe2557a1f9904 WHIRLPOOL 3d61da910434a72e2f71c9e0602c0fa44a96ffbec4fc19006b73369fedd8fed7b39a8280df4cb98780ea3bd2f2d8ca822f8b028fb97b85f84b03d633890b1f23 EBUILD aerospike-server-community-3.5.8.ebuild 1663 SHA256 29a4869c9fbca46e49e774cfecc8a0db7d6d817bb0c03738a3c89c6a243275fb SHA512 7a958e273f32eecc64d72fe74849b0b118c655e040c4034a53313b071619c188ee30fa775e62dbe64a4f5d647a55e4a550b6c9625ad93b19313e5bfc324eff0b WHIRLPOOL 5cd77ee1e480da8bced78bce389348cfc89b3eac3909fd16fac0aa1457bb3cc7a21f9eef48984f4cf7c893db3e0787f4f87d163d75912d654f8d15b6d0c5087b diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.5.8-r1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.5.8-r1.ebuild index 8525005..f291ef0 100644 --- a/dev-db/aerospike-server-community/aerospike-server-community-3.5.8-r1.ebuild +++ b/dev-db/aerospike-server-community/aerospike-server-community-3.5.8-r1.ebuild @@ -6,13 +6,13 @@ EAPI=5 EGIT_REPO_URI="https://github.com/aerospike/aerospike-server.git"; -inherit autotools base eutils git-2 user +inherit base git-2 systemd user DESCRIPTION="Flash-optimized, in-memory, nosql database" HOMEPAGE="http://www.aerospike.com"; SRC_URI="" -LICENSE="AGPL" +LICENSE="AGPL Apache-2.0" SLOT="0" KEYWORDS="~amd64" IUSE="+tools" @@ -22,6 +22,13 @@ RDEPEND="app-crypt/gcr dev-libs/jemalloc" DEPEND="${RDEPEND}" +DOCS=( + README.md +) + +PATCHES=( + "${FILESDIR}"/3.5.8-use-system-libs.patch +) pkg_setup() { enewgroup aerospike @@ -29,9 +36,9 @@ pkg_setup() { } src_prepare() { - git submodule update --init + base_src_prepare - epatch "${FILESDIR}/3.5.8-use-system-libs.patch" + git submodule update --init sed \ -e 's/USE_SYSTEM_JEM = 0/USE_SYSTEM_JEM = 1/g' \ @@ -46,6 +53,8 @@ src_prepare() { } src_install() { + base_src_install_docs + dobin target/Linux-x86_64/bin/asd insinto /opt/aerospike/sys/udf/lua @@ -70,6 +79,7 @@ src_install() { newins as/etc/logrotate_asd aerospike newinitd "${FILESDIR}"/aerospike.init aerospike + systemd_newunit as/etc/aerospike-server.service aerospike.service fowners -R aerospike:aerospike /opt/aerospike/ fowners aerospike:aerospike /usr/bin/asd diff --git a/dev-python/aerospike/Manifest b/dev-python/aerospike/Manifest index e3ae34b..702caa7 100644 --- a/dev-python/aerospike/Manifest +++ b/dev-python/aerospike/Manifest @@ -1,3 +1,3 @@ DIST aerospike-1.0.42.tar.gz 109115 SHA256 3c2fc14f59e02c8a3443f5cee530b8a39880961fa6bcd99e54f57d45f611424f SHA512 7c74b56dd0ac26cdef07357cce11592b6c649163e7372672e23a7cdfc6e2c714d10a2db9835439f3f509aa828cbf72370be6008764fdf76b3959ee7a3951d649 WHIRLPOOL 3540b2fc83999fd631feeb7e57e27223f456821877033b166553ccd17cd222cc86e7688fd31ab0a9733ec4bce986fc368a0a584064a9122265dd3efb8750963b -EBUILD aerospike-1.0.42.ebuild 704 SHA256 71486a4e1717dd8736a9f51fe6fc99ef2b0f252a8d4ffeae02f850ee18b0ccf7 SHA512 c01c5540b845e9f24754232aea75e13b2fde4fa1e7fe9d38ecee1f3d9540214bf63c0da3f7a806662a0023a99151c5213f3c67f53af24f1d441096cde079e98c WHIRLPOOL 46f3c276b973637c814a195abe6f291b8cf9c59910e9448922541be30b1fee6607bd6e33b1d5c3f02146f070f5b5a288622c52b174c0b029d7e4c10184ded2e5 +EBUILD aerospike-1.0.42.ebuild 869 SHA256 ac00a8d8af4443d749fadae543f5ead8e96a138d9032d1961a925648a85a4c67 SHA512 2570867b6ba8f24a8a631223d8b738ec1ea0bce3485d1d1c40b2a6364a8cd378a6b4081c56d2a354019a3e279298e3aa70561e936dd92b7603fbef6c41c871a7 WHIRLPOOL 8f9779bc682b56f82ca2dd556664f12f56096f7ced3c7b6fd96ff9af624d730c3f27a1566b6053c08337b75d37084b9572323d19e145b8972ab5727009e66684 MISC metadata.xml 232 SHA256 00ad74d7e2650f3d8223c43538680ff1b9839d0af454ed6b074f1e13efe8b516 SHA512 0a66e3a97a5b586d4314ca7e03fc45792e950db159f357a4ef0a618f746ed04376f6f354ce6786c8c860aa44be8157cebc0e2c3f2a571044ae17fc68709c0919 WHIRLPOOL 9f6ebd8961835648f6d2840ce9a74e24e6e617c7be9917cad8d52d738d266198209c2fcbad5a55341358e85019bb858a3699e91e5ae1636191d5e6570672a0ed diff --git a/dev-python/aerospike/aerospike-1.0.42.ebuild b/dev-python/aerospike/aerospike-1.0.42.ebuild index 4b0a8bc..5d946f1 100644 --- a/dev-python/aerospike/aerospike-1.0.42.ebuild +++ b/dev-python/aerospike/aerospike-1.0.42.ebuild @@ -23,6 +23,10 @@ DEPEND="${RDEPEND}" RESTRICT="test" +src_prepare() { + sed -e "s@aerospike_c_prefix = './aerospike-client-c'@aerospike_c_prefix = '/usr'@g" -i setup.py || die +} + python_install_all() { AEROSPIKE_LUA_PATH=/opt/aerospike/client/sys/udf/lua/ PREFIX=/usr distutils-r1_python_install_all rm -rf "${D}"/usr/aerospike
