1 |
ssuominen 10/02/10 14:21:29 |
2 |
|
3 |
Modified: ChangeLog epdfview-0.1.7-r2.ebuild |
4 |
epdfview-0.1.6-r1.ebuild |
5 |
Log: |
6 |
Fix poppler depend. Fix USE nls wrt #283507, thanks to Arseny Solokha for reporting. |
7 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.37 app-text/epdfview/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/ChangeLog?rev=1.37&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/ChangeLog?rev=1.37&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/ChangeLog?r1=1.36&r2=1.37 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v |
19 |
retrieving revision 1.36 |
20 |
retrieving revision 1.37 |
21 |
diff -u -r1.36 -r1.37 |
22 |
--- ChangeLog 26 Apr 2009 13:22:25 -0000 1.36 |
23 |
+++ ChangeLog 10 Feb 2010 14:21:28 -0000 1.37 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for app-text/epdfview |
26 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.36 2009/04/26 13:22:25 loki_val Exp $ |
28 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.37 2010/02/10 14:21:28 ssuominen Exp $ |
30 |
+ |
31 |
+ 10 Feb 2010; Samuli Suominen <ssuominen@g.o> |
32 |
+ epdfview-0.1.6-r1.ebuild, epdfview-0.1.7-r2.ebuild: |
33 |
+ Fix poppler depend. Fix USE nls wrt #283507, thanks to Arseny Solokha for |
34 |
+ reporting. |
35 |
|
36 |
*epdfview-0.1.7-r2 (26 Apr 2009) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.2 app-text/epdfview/epdfview-0.1.7-r2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild?rev=1.2&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild?rev=1.2&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild?r1=1.1&r2=1.2 |
46 |
|
47 |
Index: epdfview-0.1.7-r2.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v |
50 |
retrieving revision 1.1 |
51 |
retrieving revision 1.2 |
52 |
diff -u -r1.1 -r1.2 |
53 |
--- epdfview-0.1.7-r2.ebuild 26 Apr 2009 13:22:25 -0000 1.1 |
54 |
+++ epdfview-0.1.7-r2.ebuild 10 Feb 2010 14:21:28 -0000 1.2 |
55 |
@@ -1,10 +1,9 @@ |
56 |
-# Copyright 1999-2009 Gentoo Foundation |
57 |
+# Copyright 1999-2010 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.1 2009/04/26 13:22:25 loki_val Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.2 2010/02/10 14:21:28 ssuominen Exp $ |
61 |
|
62 |
-EAPI="2" |
63 |
- |
64 |
-inherit gnome2 flag-o-matic eutils |
65 |
+EAPI=2 |
66 |
+inherit eutils gnome2 |
67 |
|
68 |
DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries." |
69 |
HOMEPAGE="http://trac.emma-soft.com/epdfview/" |
70 |
@@ -15,32 +14,39 @@ |
71 |
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
72 |
IUSE="cups nls test" |
73 |
|
74 |
-RDEPEND=">=virtual/poppler-glib-0.5.0[cairo] |
75 |
- >=x11-libs/gtk+-2.6 |
76 |
+RDEPEND=">=app-text/poppler-0.12.3-r3[cairo] |
77 |
+ >=x11-libs/gtk+-2.6:2 |
78 |
cups? ( >=net-print/cups-1.1 )" |
79 |
DEPEND="${RDEPEND} |
80 |
- >=dev-util/pkgconfig-0.9 |
81 |
+ dev-util/pkgconfig |
82 |
nls? ( sys-devel/gettext ) |
83 |
test? ( dev-util/cppunit ) |
84 |
- userland_GNU? ( >=sys-apps/findutils-4.4.0 )" |
85 |
+ userland_GNU? ( >=sys-apps/findutils-4.4 )" |
86 |
|
87 |
pkg_setup() { |
88 |
- G2CONF=$(use_with cups) |
89 |
+ G2CONF="--disable-dependency-tracking |
90 |
+ $(use_enable nls) |
91 |
+ $(use_with cups)" |
92 |
+ |
93 |
DOCS="AUTHORS NEWS README THANKS" |
94 |
} |
95 |
|
96 |
src_prepare() { |
97 |
- gnome2_src_prepare |
98 |
- sed -i -e 's:Icon=icon_epdfview-48:Icon=epdfview:' data/epdfview.desktop || die "desktop sed failed" |
99 |
+ sed -i \ |
100 |
+ -e 's:Icon=icon_epdfview-48:Icon=epdfview:' \ |
101 |
+ data/epdfview.desktop || die |
102 |
+ |
103 |
epatch "${FILESDIR}"/${PN}-0.1.7-mouse-scrolling.patch |
104 |
+ |
105 |
+ gnome2_src_prepare |
106 |
} |
107 |
|
108 |
src_install() { |
109 |
gnome2_src_install |
110 |
- for size in 24 32 48 |
111 |
- do |
112 |
- icnsdir="/usr/share/icons/hicolor/${size}x${size}/apps/" |
113 |
- insinto "${icnsdir}" || die "insinto failed" |
114 |
- newins data/icon_epdfview-${size}.png epdfview.png || die "newins failed" |
115 |
+ |
116 |
+ local res |
117 |
+ for res in 24 32 48; do |
118 |
+ insinto /usr/share/icons/hicolor/${res}x${res}/apps |
119 |
+ newins data/icon_epdfview-${res}.png epdfview.png || die |
120 |
done |
121 |
} |
122 |
|
123 |
|
124 |
|
125 |
1.14 app-text/epdfview/epdfview-0.1.6-r1.ebuild |
126 |
|
127 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild?rev=1.14&view=markup |
128 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild?rev=1.14&content-type=text/plain |
129 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild?r1=1.13&r2=1.14 |
130 |
|
131 |
Index: epdfview-0.1.6-r1.ebuild |
132 |
=================================================================== |
133 |
RCS file: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild,v |
134 |
retrieving revision 1.13 |
135 |
retrieving revision 1.14 |
136 |
diff -u -r1.13 -r1.14 |
137 |
--- epdfview-0.1.6-r1.ebuild 10 Apr 2009 23:20:31 -0000 1.13 |
138 |
+++ epdfview-0.1.6-r1.ebuild 10 Feb 2010 14:21:28 -0000 1.14 |
139 |
@@ -1,6 +1,6 @@ |
140 |
-# Copyright 1999-2009 Gentoo Foundation |
141 |
+# Copyright 1999-2010 Gentoo Foundation |
142 |
# Distributed under the terms of the GNU General Public License v2 |
143 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild,v 1.13 2009/04/10 23:20:31 loki_val Exp $ |
144 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.6-r1.ebuild,v 1.14 2010/02/10 14:21:28 ssuominen Exp $ |
145 |
|
146 |
EAPI="2" |
147 |
inherit eutils |
148 |
@@ -14,8 +14,8 @@ |
149 |
KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" |
150 |
IUSE="cups nls test" |
151 |
|
152 |
-COMMON_DEPEND=">=virtual/poppler-glib-0.5.0[cairo] |
153 |
- >=x11-libs/gtk+-2.6 |
154 |
+COMMON_DEPEND=">=app-text/poppler-0.12.3-r3[cairo] |
155 |
+ >=x11-libs/gtk+-2.6:2 |
156 |
cups? ( >=net-print/cups-1.1 )" |
157 |
DEPEND="${COMMON_DEPEND} |
158 |
>=dev-util/pkgconfig-0.9 |
159 |
@@ -24,10 +24,7 @@ |
160 |
RDEPEND="${COMMON_DEPEND} |
161 |
nls? ( virtual/libintl )" |
162 |
|
163 |
-src_unpack() { |
164 |
- unpack ${A} |
165 |
- cd "${S}" |
166 |
- |
167 |
+src_prepare() { |
168 |
epatch "${FILESDIR}/${P}-gcc-4.3.patch" |
169 |
epatch "${FILESDIR}/${P}-print-segfault.patch" |
170 |
} |