1 |
commit: 585fc69191ddb943600b25f6f77ef4d9f4f3a9af |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 5 06:39:14 2016 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 5 08:06:33 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585fc691 |
7 |
|
8 |
app-editors/scite: fixes to vn. 3.6.2 sourced from gentoo bug |
9 |
|
10 |
- inherit toolchain-funcs eclass to ensure the build to 'respect CXX', |
11 |
- add slot operators to deps requiring them (glib, gtk+, lua) |
12 |
- removed dep sed from deps (set in @system) |
13 |
fixes the gentoo bug |
14 |
|
15 |
Gentoo-bug: #Bug 569986 |
16 |
|
17 |
Package-Manager: portage-2.2.28 |
18 |
|
19 |
app-editors/scite/scite-3.6.2.ebuild | 48 +++++++++++++++++++----------------- |
20 |
1 file changed, 26 insertions(+), 22 deletions(-) |
21 |
|
22 |
diff --git a/app-editors/scite/scite-3.6.2.ebuild b/app-editors/scite/scite-3.6.2.ebuild |
23 |
index f17d015..aa103c2 100644 |
24 |
--- a/app-editors/scite/scite-3.6.2.ebuild |
25 |
+++ b/app-editors/scite/scite-3.6.2.ebuild |
26 |
@@ -1,8 +1,8 @@ |
27 |
-# Copyright 1999-2015 Gentoo Foundation |
28 |
+# Copyright 1999-2016 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
# $Id$ |
31 |
|
32 |
-EAPI="5" |
33 |
+EAPI="6" |
34 |
|
35 |
inherit toolchain-funcs eutils |
36 |
|
37 |
@@ -16,35 +16,38 @@ SLOT="0" |
38 |
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux" |
39 |
IUSE="lua" |
40 |
|
41 |
-RDEPEND="dev-libs/glib:2 |
42 |
+RDEPEND="dev-libs/glib:= |
43 |
x11-libs/cairo |
44 |
- x11-libs/gtk+:2 |
45 |
+ x11-libs/gtk+:2= |
46 |
x11-libs/gdk-pixbuf |
47 |
x11-libs/pango |
48 |
- lua? ( >=dev-lang/lua-5:0= )" |
49 |
+ lua? ( >=dev-lang/lua-5:= )" |
50 |
DEPEND="${RDEPEND} |
51 |
- virtual/pkgconfig |
52 |
- >=sys-apps/sed-4" |
53 |
+ virtual/pkgconfig" |
54 |
|
55 |
S="${WORKDIR}/${PN}/gtk" |
56 |
|
57 |
src_prepare() { |
58 |
- cd "${WORKDIR}/scintilla/gtk" |
59 |
- sed -i makefile \ |
60 |
+ sed -i "${WORKDIR}/scintilla/gtk/makefile" \ |
61 |
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \ |
62 |
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \ |
63 |
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \ |
64 |
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \ |
65 |
-e "s#-Os##" \ |
66 |
- || die "error patching makefile" |
67 |
+ || die "error patching /scintilla/gtk/makefile" |
68 |
|
69 |
- cd "${WORKDIR}/scite/gtk" |
70 |
- sed -i makefile \ |
71 |
+ sed -i "${WORKDIR}/scite/gtk/makefile" \ |
72 |
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ |
73 |
- || die "error patching makefile" |
74 |
+ || die "error patching /scite/gtk/makefile" |
75 |
|
76 |
- cd "${S}" |
77 |
- sed -i makefile \ |
78 |
+ # repair and enhance the .desktop file |
79 |
+ sed -i "${WORKDIR}/scite/gtk/SciTE.desktop" \ |
80 |
+ -e "s/^Encoding/#Encoding/" \ |
81 |
+ -e "s#text/plain#text/\*;application/xhtml+xml#" \ |
82 |
+ -e "s#^Categories=\(.*\)#Categories=Development;#" \ |
83 |
+ || die "error patching /scite/gtk/SciTe.desktop" |
84 |
+ |
85 |
+ sed -i "${S}/makefile" \ |
86 |
-e 's#usr/local#usr#g' \ |
87 |
-e 's#/gnome/apps/Applications#/applications#' \ |
88 |
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \ |
89 |
@@ -54,11 +57,16 @@ src_prepare() { |
90 |
-e 's#${D}##' \ |
91 |
-e 's#-g root#-g 0#' \ |
92 |
-e "s#-Os##" \ |
93 |
- || die "error patching makefile" |
94 |
+ || die "error patching gtk/makefile" |
95 |
+ |
96 |
+ eapply_user |
97 |
} |
98 |
|
99 |
src_compile() { |
100 |
- emake -C ../../scintilla/gtk AR="$(tc-getAR)" |
101 |
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" \ |
102 |
+ LDFLAGS="$(raw-ldflags)" AR="$(tc-getAR)" \ |
103 |
+ -C "${WORKDIR}/scintilla/gtk" |
104 |
+ |
105 |
if use lua; then |
106 |
emake |
107 |
else |
108 |
@@ -70,16 +78,12 @@ src_install() { |
109 |
dodir /usr/bin |
110 |
dodir /usr/share/{pixmaps,applications} |
111 |
|
112 |
- emake prefix="${ED}/usr" install |
113 |
+ emake DESTDIR="${ED}" install |
114 |
|
115 |
# we have to keep this because otherwise it'll break upgrading |
116 |
mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die |
117 |
dosym /usr/bin/scite /usr/bin/SciTE |
118 |
|
119 |
- # replace .desktop file with our own working version |
120 |
- rm -f "${ED}/usr/share/applications/SciTE.desktop" || die |
121 |
- domenu "${FILESDIR}/scite.desktop" |
122 |
- |
123 |
doman ../doc/scite.1 |
124 |
dodoc ../README |
125 |
} |