[gentoo-commits] dev/yngwin:master commit in: app-editors/neovim/files/, app-editors/neovim/, dev-lua/messagepack/ - gentoo-commits

From:	Ben de Groot <yngwin@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] dev/yngwin:master commit in: app-editors/neovim/files/, app-editors/neovim/, dev-lua/messagepack/
Date:	Thu, 26 Feb 2015 04:28:48
Message-Id:	`1424924907.2790cee3c2c6bcabaaa674ffd1c2c58857a46248.yngwin@gentoo`

1

commit:     2790cee3c2c6bcabaaa674ffd1c2c58857a46248

2

Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>

3

AuthorDate: Thu Feb 26 04:28:27 2015 +0000

4

Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>

5

CommitDate: Thu Feb 26 04:28:27 2015 +0000

6

URL:        http://sources.gentoo.org/gitweb/?p=dev/yngwin.git;a=commit;h=2790cee3

7

8

neovim and messagepack ebuild improvements

9

10

---

11

 app-editors/neovim/Manifest                                      | 2 +-

12

 app-editors/neovim/files/nvimrc                                  | 9 +++++++--

13

 ...-0.0.0_pre20150223.ebuild => neovim-0.0.0_pre20150225.ebuild} | 7 ++++++-

14

 app-editors/neovim/neovim-9999.ebuild                            | 7 ++++++-

15

 dev-lua/messagepack/messagepack-0.3.2.ebuild                     | 4 ++--

16

 5 files changed, 22 insertions(+), 7 deletions(-)

17

18

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest

19

index da176de..7542740 100644

20

--- a/app-editors/neovim/Manifest

21

+++ b/app-editors/neovim/Manifest

22

@@ -1 +1 @@

23

-DIST neovim-0.0.0_pre20150223.tar.xz 4764536 SHA256 67b8df47d37172f1f87d4ce3480fbc68611f447ae53dea5b3e96ae7ae4ccdb17 SHA512 f1aafe6e79f46c67394def4a72d50fe921c89f9209e7e23c785e7892006b97f4ce86eaccd470ccb980f822d3897f65a9934789d77f7ad5d05d92c259ecf16150 WHIRLPOOL cb2069705bd6e62344667bb08e146bd159d60c9fb1331931462c3fb21f3a134e326fe228cfd50b8b14bd37648cab10c89721319ae29499d850f454942a3a783f

24

+DIST neovim-0.0.0_pre20150225.tar.xz 4768060 SHA256 c2b9e1d60d5006022938c0cef0a25178a8fc3aefe469dc555b9396f8240dd82b SHA512 7854aabd9384bf5c90cec2f478aa9b2f173f03d7f3a1f8645e3331a7f20cade58cf68e13a117785905564d09f5b6029d22aa9ea7263f739385135becfbd50ced WHIRLPOOL d0cf544d18d925fb809f1a4dcfc1622733a7079313d8c4462efd3c371ebb5db27a4c442a0913b122c0d2ed5e1c37dca605bbfc99ed4dd920a2b006eba0d98930

25

26

diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc

27

index 6e3ddfb..e49b3c4 100644

28

--- a/app-editors/neovim/files/nvimrc

29

+++ b/app-editors/neovim/files/nvimrc

30

@@ -8,12 +8,11 @@

31

32

 " {{{ General settings

33

 " The following are some sensible defaults for Vim for most users.

34

-" We attempt to change as little as possible from Vim's defaults,

35

-" deviating only where it makes sense

36

 set bs=2                " Allow backspacing over everything in insert mode

37

 set ai                  " Always set auto-indenting on

38

 set history=50          " keep 50 lines of command history

39

 set ruler               " Show the cursor position all the time

40

+set formatoptions+=j    " Delete comment character when joining commented lines

41

42

 " Don't use Ex mode, use Q for formatting

43

 map Q gq

44

@@ -27,6 +26,9 @@ set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo

45

 " doesn't enable line numbers -- :set number will do that. The value given is a

46

 " minimum width to use for the number column, not a fixed size.

47

 set numberwidth=3

48

+

49

+" Use sensible whitespace indicators

50

+set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+

51

 " }}}

52

53

 " {{{ Modeline settings

54

@@ -151,6 +153,9 @@ augroup gentoo

55

56

 augroup END

57

58

+" Strip trailing spaces on write

59

+autocmd BufWritePre * :%s/\s\+$//e

60

+

61

 endif " has("autocmd")

62

 " }}}

63

64

65

diff --git a/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild

66

similarity index 85%

67

rename from app-editors/neovim/neovim-0.0.0_pre20150223.ebuild

68

rename to app-editors/neovim/neovim-0.0.0_pre20150225.ebuild

69

index ef449d4..64020f8 100644

70

--- a/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild

71

+++ b/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild

72

@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}

73

 	python? ( dev-python/neovim-python-client )"

74

75

 src_prepare() {

76

+	# do not link statically

77

+	sed -e '/^set(LIBUNIBILIUM/s|ON|OFF|' -e '/^set(LIBTERMKEY/s|ON|OFF|' \

78

+		-i CMakeLists.txt

79

+	# use our system vim dir

80

 	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \

81

 		-i src/nvim/os_unix_defs.h || die

82

 	cmake-utils_src_prepare

83

@@ -49,7 +53,8 @@ src_configure() {

84

}

85

86

 src_install() {

87

-	default

88

+	cmake-utils_src_install

89

+	# install a default configuration file

90

 	insinto "${EPREFIX}"/etc/vim

91

 	doins "${FILESDIR}"/nvimrc

92

}

93

94

diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild

95

index ef449d4..64020f8 100644

96

--- a/app-editors/neovim/neovim-9999.ebuild

97

+++ b/app-editors/neovim/neovim-9999.ebuild

98

@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}

99

 	python? ( dev-python/neovim-python-client )"

100

101

 src_prepare() {

102

+	# do not link statically

103

+	sed -e '/^set(LIBUNIBILIUM/s|ON|OFF|' -e '/^set(LIBTERMKEY/s|ON|OFF|' \

104

+		-i CMakeLists.txt

105

+	# use our system vim dir

106

 	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \

107

 		-i src/nvim/os_unix_defs.h || die

108

 	cmake-utils_src_prepare

109

@@ -49,7 +53,8 @@ src_configure() {

110

}

111

112

 src_install() {

113

-	default

114

+	cmake-utils_src_install

115

+	# install a default configuration file

116

 	insinto "${EPREFIX}"/etc/vim

117

 	doins "${FILESDIR}"/nvimrc

118

}

119

120

diff --git a/dev-lua/messagepack/messagepack-0.3.2.ebuild b/dev-lua/messagepack/messagepack-0.3.2.ebuild

121

index 31c329b..d2f633e 100644

122

--- a/dev-lua/messagepack/messagepack-0.3.2.ebuild

123

+++ b/dev-lua/messagepack/messagepack-0.3.2.ebuild

124

@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}

125

 src_install() {

126

 	local lua=lua

127

 	use luajit && lua=luajit

128

-	emake LUAVER="$($(tc-getPKG_CONFIG) --variable V ${lua})" \

129

-		PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install

130

+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"

131

+	doins src/MessagePack.lua

132

 	dodoc CHANGES README.md

133

}

1	commit: 2790cee3c2c6bcabaaa674ffd1c2c58857a46248
2	Author: Ben de Groot <yngwin <AT> gentoo <DOT> org>
3	AuthorDate: Thu Feb 26 04:28:27 2015 +0000
4	Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
5	CommitDate: Thu Feb 26 04:28:27 2015 +0000
6	URL: http://sources.gentoo.org/gitweb/?p=dev/yngwin.git;a=commit;h=2790cee3
7
8	neovim and messagepack ebuild improvements
9
10	---
11	app-editors/neovim/Manifest \| 2 +-
12	app-editors/neovim/files/nvimrc \| 9 +++++++--
13	...-0.0.0_pre20150223.ebuild => neovim-0.0.0_pre20150225.ebuild} \| 7 ++++++-
14	app-editors/neovim/neovim-9999.ebuild \| 7 ++++++-
15	dev-lua/messagepack/messagepack-0.3.2.ebuild \| 4 ++--
16	5 files changed, 22 insertions(+), 7 deletions(-)
17
18	diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
19	index da176de..7542740 100644
20	--- a/app-editors/neovim/Manifest
21	+++ b/app-editors/neovim/Manifest
22	@@ -1 +1 @@
23	-DIST neovim-0.0.0_pre20150223.tar.xz 4764536 SHA256 67b8df47d37172f1f87d4ce3480fbc68611f447ae53dea5b3e96ae7ae4ccdb17 SHA512 f1aafe6e79f46c67394def4a72d50fe921c89f9209e7e23c785e7892006b97f4ce86eaccd470ccb980f822d3897f65a9934789d77f7ad5d05d92c259ecf16150 WHIRLPOOL cb2069705bd6e62344667bb08e146bd159d60c9fb1331931462c3fb21f3a134e326fe228cfd50b8b14bd37648cab10c89721319ae29499d850f454942a3a783f
24	+DIST neovim-0.0.0_pre20150225.tar.xz 4768060 SHA256 c2b9e1d60d5006022938c0cef0a25178a8fc3aefe469dc555b9396f8240dd82b SHA512 7854aabd9384bf5c90cec2f478aa9b2f173f03d7f3a1f8645e3331a7f20cade58cf68e13a117785905564d09f5b6029d22aa9ea7263f739385135becfbd50ced WHIRLPOOL d0cf544d18d925fb809f1a4dcfc1622733a7079313d8c4462efd3c371ebb5db27a4c442a0913b122c0d2ed5e1c37dca605bbfc99ed4dd920a2b006eba0d98930
25
26	diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc
27	index 6e3ddfb..e49b3c4 100644
28	--- a/app-editors/neovim/files/nvimrc
29	+++ b/app-editors/neovim/files/nvimrc
30	@@ -8,12 +8,11 @@
31
32	" {{{ General settings
33	" The following are some sensible defaults for Vim for most users.
34	-" We attempt to change as little as possible from Vim's defaults,
35	-" deviating only where it makes sense
36	set bs=2 " Allow backspacing over everything in insert mode
37	set ai " Always set auto-indenting on
38	set history=50 " keep 50 lines of command history
39	set ruler " Show the cursor position all the time
40	+set formatoptions+=j " Delete comment character when joining commented lines
41
42	" Don't use Ex mode, use Q for formatting
43	map Q gq
44	@@ -27,6 +26,9 @@ set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
45	" doesn't enable line numbers -- :set number will do that. The value given is a
46	" minimum width to use for the number column, not a fixed size.
47	set numberwidth=3
48	+
49	+" Use sensible whitespace indicators
50	+set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
51	" }}}
52
53	" {{{ Modeline settings
54	@@ -151,6 +153,9 @@ augroup gentoo
55
56	augroup END
57
58	+" Strip trailing spaces on write
59	+autocmd BufWritePre * :%s/\s\+$//e
60	+
61	endif " has("autocmd")
62	" }}}
63
64
65	diff --git a/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
66	similarity index 85%
67	rename from app-editors/neovim/neovim-0.0.0_pre20150223.ebuild
68	rename to app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
69	index ef449d4..64020f8 100644
70	--- a/app-editors/neovim/neovim-0.0.0_pre20150223.ebuild
71	+++ b/app-editors/neovim/neovim-0.0.0_pre20150225.ebuild
72	@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}
73	python? ( dev-python/neovim-python-client )"
74
75	src_prepare() {
76	+ # do not link statically
77	+ sed -e '/^set(LIBUNIBILIUM/s\|ON\|OFF\|' -e '/^set(LIBTERMKEY/s\|ON\|OFF\|' \
78	+ -i CMakeLists.txt
79	+ # use our system vim dir
80	sed -e '/^# define SYS_VIMRC_FILE/s\|$VIM\|'"${EPREFIX}"'/etc/vim\|' \
81	-i src/nvim/os_unix_defs.h \|\| die
82	cmake-utils_src_prepare
83	@@ -49,7 +53,8 @@ src_configure() {
84	}
85
86	src_install() {
87	- default
88	+ cmake-utils_src_install
89	+ # install a default configuration file
90	insinto "${EPREFIX}"/etc/vim
91	doins "${FILESDIR}"/nvimrc
92	}
93
94	diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
95	index ef449d4..64020f8 100644
96	--- a/app-editors/neovim/neovim-9999.ebuild
97	+++ b/app-editors/neovim/neovim-9999.ebuild
98	@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}
99	python? ( dev-python/neovim-python-client )"
100
101	src_prepare() {
102	+ # do not link statically
103	+ sed -e '/^set(LIBUNIBILIUM/s\|ON\|OFF\|' -e '/^set(LIBTERMKEY/s\|ON\|OFF\|' \
104	+ -i CMakeLists.txt
105	+ # use our system vim dir
106	sed -e '/^# define SYS_VIMRC_FILE/s\|$VIM\|'"${EPREFIX}"'/etc/vim\|' \
107	-i src/nvim/os_unix_defs.h \|\| die
108	cmake-utils_src_prepare
109	@@ -49,7 +53,8 @@ src_configure() {
110	}
111
112	src_install() {
113	- default
114	+ cmake-utils_src_install
115	+ # install a default configuration file
116	insinto "${EPREFIX}"/etc/vim
117	doins "${FILESDIR}"/nvimrc
118	}
119
120	diff --git a/dev-lua/messagepack/messagepack-0.3.2.ebuild b/dev-lua/messagepack/messagepack-0.3.2.ebuild
121	index 31c329b..d2f633e 100644
122	--- a/dev-lua/messagepack/messagepack-0.3.2.ebuild
123	+++ b/dev-lua/messagepack/messagepack-0.3.2.ebuild
124	@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
125	src_install() {
126	local lua=lua
127	use luajit && lua=luajit
128	- emake LUAVER="$($(tc-getPKG_CONFIG) --variable V ${lua})" \
129	- PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
130	+ insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
131	+ doins src/MessagePack.lua
132	dodoc CHANGES README.md
133	}

Gentoo Archives: gentoo-commits