Gentoo Archives: gentoo-commits

From: Michael Weber <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/xmw:master commit in: app-misc/info-beamer/, app-misc/info-beamer/files/
Date: Wed, 12 Feb 2014 23:36:54
Message-Id: 1392248200.31de815f6420ad8cca476f0ac1af87e6b0c12b91.xmw@gentoo
1 commit: 31de815f6420ad8cca476f0ac1af87e6b0c12b91
2 Author: Michael Weber <michael <AT> xmw <DOT> de>
3 AuthorDate: Wed Feb 12 23:36:40 2014 +0000
4 Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 12 23:36:40 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=31de815f
7
8 shorter patch
9
10 Package-Manager: portage-2.2.8-r1
11 Manifest-Sign-Key: 62EEF090
12
13 ---
14 app-misc/info-beamer/ChangeLog | 4 ++++
15 app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch | 6 ++----
16 2 files changed, 6 insertions(+), 4 deletions(-)
17
18 diff --git a/app-misc/info-beamer/ChangeLog b/app-misc/info-beamer/ChangeLog
19 index c2d7953..b22cb01 100644
20 --- a/app-misc/info-beamer/ChangeLog
21 +++ b/app-misc/info-beamer/ChangeLog
22 @@ -1,3 +1,7 @@
23 + 12 Feb 2014; Michael Weber <xmw@g.o>
24 + files/info-beamer-1.0_pre3-pkgconfig.patch:
25 + shorter patch
26 +
27 *info-beamer-1.0_pre3 (12 Feb 2014)
28 *info-beamer-9999 (12 Feb 2014)
29
30
31 diff --git a/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch b/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
32 index 3d8dfab..c448580 100644
33 --- a/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
34 +++ b/app-misc/info-beamer/files/info-beamer-1.0_pre3-pkgconfig.patch
35 @@ -1,18 +1,16 @@
36 --- info-beamer-9999/Makefile
37 +++ info-beamer-9999/Makefile
38 -@@ -11,9 +11,9 @@
39 +@@ -11,8 +11,8 @@
40 endif
41
42 ifdef USE_LUAJIT
43 -LUA_CFLAGS ?= -I/usr/include/luajit-2.0
44 -LUA_LDFLAGS ?= -lluajit-5.1
45 --LUA_LUAC ?= luac
46 +LUA_CFLAGS ?= $(shell pkg-config --cflags luajit)
47 +LUA_LDFLAGS ?= $(shell pkg-config --libs luajit)
48 -+LUA_LUAC ?= luac
49 + LUA_LUAC ?= luac
50 CFLAGS += -DUSE_LUAJIT=1
51 else
52 - #################################################
53 @@ -24,14 +24,14 @@
54 # $ LUA_LDFLAGS=-llua make
55 #