commit: 44113aad80a45f31052cf70ea36455537a1049fb
Author: Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 23 08:09:40 2015 +0000
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Mon Feb 23 08:09:40 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=dev/yngwin.git;a=commit;h=44113aad
neovim and deps updates from suggestions
---
app-editors/neovim/Manifest | 3 +--
..._pre20150221.ebuild => neovim-0.0.0_pre20150223.ebuild} | 14 ++++++++------
app-editors/neovim/neovim-9999.ebuild | 14 ++++++++------
dev-libs/libtermkey/libtermkey-0.17.ebuild | 3 ++-
dev-libs/unibilium/Manifest | 1 +
.../{unibilium-1.1.1.ebuild => unibilium-1.1.2.ebuild} | 3 ++-
dev-lua/lua-MessagePack/Manifest | 1 -
dev-lua/messagepack/Manifest | 1 +
.../messagepack-0.3.2.ebuild} | 13 ++++++++-----
dev-lua/{lua-MessagePack => messagepack}/metadata.xml | 0
10 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 9eaf903..da176de 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,2 +1 @@
-DIST neovim-0.0.0_pre20150220.tar.gz 7369427 SHA256
d6628a2de3f5fea5983a6ee9fa7d3eae4e1d3469ab5948ac4d5f27fd3131229c SHA512
4580539c975848cd94402e045e983ee40e585a515ac4dca343fa6ee354359a74222738b682359c1f98619a70578abaf4e482023fdb9b25ea80dbf6e8cf53a22d
WHIRLPOOL
f68b1d8512f62f8f3b6c7871642c4b257f6f72ed920e6c91a358180a559b0db87ba5e5758d1849437aa00f14322fe59d6318b071616c22e1e700929332bfa98f
-DIST neovim-0.0.0_pre20150221.tar.gz 7346903 SHA256
b1bc7d6bcbee7a0b343f6419e2e314e9630e06c1fbd12c9c400efef0e91b3721 SHA512
c82038b3b38639d71a07bed5a0bb1ad7bdd363a5d4cf382cb8cf91ec226ab8cf00ce50f40ef0e08403d496a3de02f70e7e6d33d7f178f14912a61becf28775a1
WHIRLPOOL
6a6b40bb879fdd2e97f20ec8a8c8b45ce265ff1bf93d41b5417418b371ace38c0c2c0ecd59784a564eb9a859e7c57656f02b1e524663bcab084b99d591bdc43f
+DIST neovim-0.0.0_pre20150223.tar.xz 4764536 SHA256
67b8df47d37172f1f87d4ce3480fbc68611f447ae53dea5b3e96ae7ae4ccdb17 SHA512
f1aafe6e79f46c67394def4a72d50fe921c89f9209e7e23c785e7892006b97f4ce86eaccd470ccb980f822d3897f65a9934789d77f7ad5d05d92c259ecf16150
WHIRLPOOL
cb2069705bd6e62344667bb08e146bd159d60c9fb1331931462c3fb21f3a134e326fe228cfd50b8b14bd37648cab10c89721319ae29499d850f454942a3a783f
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150221.ebuild
b/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild
similarity index 79%
rename from app-editors/neovim/neovim-0.0.0_pre20150221.ebuild
rename to app-editors/neovim/neovim-0.0.0_pre20150223.ebuild
index bf39ac3..cf4f9b9 100644
--- a/app-editors/neovim/neovim-0.0.0_pre20150221.ebuild
+++ b/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild
@@ -12,9 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://github.com/neovim/neovim.git"
KEYWORDS=""
else
- inherit vcs-snapshot
- COMMIT="e9c5f96964b1dcc7d7a013ffd056b97f2674f509"
- SRC_URI="https://github.com/${PN}/${PN}/tarball/${COMMIT} ->
${P}.tar.gz"
+ SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz";
KEYWORDS="~amd64 ~x86"
fi
@@ -22,14 +20,13 @@ LICENSE="Apache-2.0 vim"
SLOT="0"
IUSE="perl python"
-CDEPEND="dev-lang/luajit
+CDEPEND="dev-lang/luajit:2
>=dev-libs/libtermkey-0.17
>=dev-libs/unibilium-1.1.1
>=dev-libs/libuv-1.2.0
>=dev-libs/msgpack-0.6.0_pre20150220
- dev-lua/LuaBitOp
dev-lua/lpeg
- dev-lua/lua-MessagePack"
+ dev-lua/messagepack"
DEPEND="${CDEPEND}
virtual/libiconv
virtual/libintl"
@@ -37,6 +34,11 @@ RDEPEND="${CDEPEND}
perl? ( dev-lang/perl )
python? ( dev-python/neovim-python-client )"
+src_prepare() {
+ sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+ -i src/nvim/os_unix_defs.h || die
+}
+
src_configure() {
append-cflags "-Wno-error"
append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
diff --git a/app-editors/neovim/neovim-9999.ebuild
b/app-editors/neovim/neovim-9999.ebuild
index 7c8bb7d..cf4f9b9 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -12,9 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://github.com/neovim/neovim.git"
KEYWORDS=""
else
- inherit vcs-snapshot
- COMMIT="8efb3607a7f6cefce450953c7f8d5e3299347bae"
- SRC_URI="https://github.com/${PN}/${PN}/tarball/${COMMIT} ->
${P}.tar.gz"
+ SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz";
KEYWORDS="~amd64 ~x86"
fi
@@ -22,14 +20,13 @@ LICENSE="Apache-2.0 vim"
SLOT="0"
IUSE="perl python"
-CDEPEND="dev-lang/luajit
+CDEPEND="dev-lang/luajit:2
>=dev-libs/libtermkey-0.17
>=dev-libs/unibilium-1.1.1
>=dev-libs/libuv-1.2.0
>=dev-libs/msgpack-0.6.0_pre20150220
- dev-lua/LuaBitOp
dev-lua/lpeg
- dev-lua/lua-MessagePack"
+ dev-lua/messagepack"
DEPEND="${CDEPEND}
virtual/libiconv
virtual/libintl"
@@ -37,6 +34,11 @@ RDEPEND="${CDEPEND}
perl? ( dev-lang/perl )
python? ( dev-python/neovim-python-client )"
+src_prepare() {
+ sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+ -i src/nvim/os_unix_defs.h || die
+}
+
src_configure() {
append-cflags "-Wno-error"
append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
diff --git a/dev-libs/libtermkey/libtermkey-0.17.ebuild
b/dev-libs/libtermkey/libtermkey-0.17.ebuild
index a414847..c88687d 100644
--- a/dev-libs/libtermkey/libtermkey-0.17.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.17.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=5
-inherit eutils multilib
+inherit eutils flag-o-matic multilib
DESCRIPTION="Library for easy processing of keyboard entry from terminal-based
programs"
HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/";
@@ -27,6 +27,7 @@ src_prepare() {
}
src_compile() {
+ append-flags -fPIC -fPIE
emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
}
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 77b7e0f..ace4b14 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1 +1,2 @@
DIST unibilium-1.1.1.tar.gz 75507 SHA256
117f2bc690877ef2b7f5b7f22a46dbea09c127dbedb5e091550a6d73231faf77 SHA512
af7a191b328f9d1b81c71b8f51ad073c58f4291d2a92dfd6260a5d9acf83682796564fe5644c6dd51fcddcb9cf4c7640d2d76b7b305774a8759ff01dee824b5c
WHIRLPOOL
7359662d1c8497999d84a09786729d4d507f85816e677397dcf11497e8f7b4a0f97995b202f2492d96f8694b95415d9875b0516ec85f13718c428e7480a3d383
+DIST unibilium-1.1.2.tar.gz 76823 SHA256
bdf3750b9e6ecdb30ba42dd0ef041c34222051495ff420c8c76d391f11e149e3 SHA512
2fe1068e732212edcf917df700d6a9810433d31481f6ddd6c5452a3470e3cf15bef79918dafd9fb20321f86b3e823c8d0cdb945ec91eeafecc9d2afc9d40f4e9
WHIRLPOOL
ee84531ee4884add1c4a9a0d11482fe13533c0851289ea945a406fbd24f22e21f80a03172a34a717b684f7a8c53360d6dc03d7a1ff7946f56cf2d0d81301ff2a
diff --git a/dev-libs/unibilium/unibilium-1.1.1.ebuild
b/dev-libs/unibilium/unibilium-1.1.2.ebuild
similarity index 91%
rename from dev-libs/unibilium/unibilium-1.1.1.ebuild
rename to dev-libs/unibilium/unibilium-1.1.2.ebuild
index bd17ff6..d76374c 100644
--- a/dev-libs/unibilium/unibilium-1.1.1.ebuild
+++ b/dev-libs/unibilium/unibilium-1.1.2.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=5
-inherit eutils multilib
+inherit eutils flag-o-matic multilib
DESCRIPTION="A very basic terminfo library"
HOMEPAGE="https://github.com/mauke/unibilium/";
@@ -19,6 +19,7 @@ DEPEND="dev-lang/perl
RDEPEND=""
src_compile() {
+ append-flags -fPIC -fPIE
emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
}
diff --git a/dev-lua/lua-MessagePack/Manifest b/dev-lua/lua-MessagePack/Manifest
deleted file mode 100644
index 40c2768..0000000
--- a/dev-lua/lua-MessagePack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lua-MessagePack-0.3.2.tar.gz 16003 SHA256
6580961958dd43455f7f74708514011e0aadf442167869fb60c53b018f041eac SHA512
8e3a6cdd42926341c63e2026a5fe8b7f7b8f01f0020cbb04528cb0e94888a90a150c9cacacd63ff089fe83bdac7f943cf5a2fd5a19480aafcf6625973cba52ad
WHIRLPOOL
5279a725e848e247134dc8e304b97170ff44bffbd07a3ce3dd6dbf30ab592c90fe9f06077deb9c4fdba7541769bfe8745912abd6daf9960e98e32c1dac7dcdca
diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest
new file mode 100644
index 0000000..5d8e625
--- /dev/null
+++ b/dev-lua/messagepack/Manifest
@@ -0,0 +1 @@
+DIST lua-messagepack-0.3.2.tar.xz 13416 SHA256
0f9e24d5a83678bf03a106504f95fc190513aa66cccf22f0f5c4129c6a3af27a SHA512
d5b0193f157ea5ce4df6fa54fab3662c279bdf03679ba4e5f9d4341875c66c4a96a5f11fd68e06a92fe2c47681584708dc79b9a9337356391c41f4de76c6ddcd
WHIRLPOOL
da8d7e72ba79232cf8e131c77a7f82850d60c47dc9772cced9a05842d5da92746564a6ff7ef7aefa9389173ba2183b87a4e2e954b37d598fc7b1fd96db1ec294
diff --git a/dev-lua/lua-MessagePack/lua-MessagePack-0.3.2.ebuild
b/dev-lua/messagepack/messagepack-0.3.2.ebuild
similarity index 61%
rename from dev-lua/lua-MessagePack/lua-MessagePack-0.3.2.ebuild
rename to dev-lua/messagepack/messagepack-0.3.2.ebuild
index 33244a1..31c329b 100644
--- a/dev-lua/lua-MessagePack/lua-MessagePack-0.3.2.ebuild
+++ b/dev-lua/messagepack/messagepack-0.3.2.ebuild
@@ -7,19 +7,22 @@ inherit toolchain-funcs
DESCRIPTION="A pure Lua implementation of the MessagePack serialization format"
HOMEPAGE="http://fperrad.github.io/lua-MessagePack/";
-SRC_URI="https://github.com/fperrad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/lua-${P}.tar.xz";
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="+luajit"
-RDEPEND=">=dev-lang/lua-5.1"
+RDEPEND="luajit? ( dev-lang/luajit:2 )
+ !luajit? ( dev-lang/lua:= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_install() {
- emake LUAVER="$($(tc-getPKG_CONFIG) --variable V lua)" \
+ local lua=lua
+ use luajit && lua=luajit
+ emake LUAVER="$($(tc-getPKG_CONFIG) --variable V ${lua})" \
PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
dodoc CHANGES README.md
}
diff --git a/dev-lua/lua-MessagePack/metadata.xml
b/dev-lua/messagepack/metadata.xml
similarity index 100%
rename from dev-lua/lua-MessagePack/metadata.xml
rename to dev-lua/messagepack/metadata.xml
