* [gentoo-commits] gentoo-x86 commit in app-text/evince: evince-3.2.1-r1.ebuild ChangeLog evince-3.2.1.ebuild
@ 2011-11-26 2:45 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2011-11-26 2:45 UTC (permalink / raw
To: gentoo-commits
tetromino 11/11/26 02:45:45
Modified: evince-3.2.1-r1.ebuild ChangeLog
evince-3.2.1.ebuild
Log:
Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber <faber@faberman.de> for reporting).
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Revision Changes Path
1.2 app-text/evince/evince-3.2.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?r1=1.1&r2=1.2
Index: evince-3.2.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evince-3.2.1-r1.ebuild 23 Nov 2011 20:35:27 -0000 1.1
+++ evince-3.2.1-r1.ebuild 26 Nov 2011 02:45:45 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.1 2011/11/23 20:35:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.2 2011/11/26 02:45:45 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -95,9 +95,6 @@
}
src_prepare() {
- # Do not depend on gnome-icon-theme, bug #326855
- sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed"
-
# Fix .desktop file so menu item shows up
epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
@@ -108,4 +105,8 @@
epatch "${FILESDIR}/${PN}-3.2.1-libgxps-0.2.patch"
gnome2_src_prepare
+
+ # Do not depend on gnome-icon-theme, bug #326855, #391859
+ sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
+ -i configure || die "sed failed"
}
1.234 app-text/evince/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.234&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.234&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?r1=1.233&r2=1.234
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- ChangeLog 23 Nov 2011 20:35:27 -0000 1.233
+++ ChangeLog 26 Nov 2011 02:45:45 -0000 1.234
@@ -1,6 +1,11 @@
# ChangeLog for app-text/evince
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.233 2011/11/23 20:35:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.234 2011/11/26 02:45:45 tetromino Exp $
+
+ 26 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> evince-3.2.1.ebuild,
+ evince-3.2.1-r1.ebuild:
+ Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber
+ <faber@faberman.de> for reporting).
*evince-3.2.1-r1 (23 Nov 2011)
1.3 app-text/evince/evince-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?r1=1.2&r2=1.3
Index: evince-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evince-3.2.1.ebuild 16 Nov 2011 10:56:15 -0000 1.2
+++ evince-3.2.1.ebuild 26 Nov 2011 02:45:45 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.2 2011/11/16 10:56:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.3 2011/11/26 02:45:45 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -92,11 +92,12 @@
}
src_prepare() {
- # Do not depend on gnome-icon-theme, bug #326855
- sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed"
-
# Fix .desktop file so menu item shows up
epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
gnome2_src_prepare
+
+ # Do not depend on gnome-icon-theme, bug #326855, #391859
+ sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
+ -i configure || die "sed failed"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/evince: evince-3.2.1-r1.ebuild ChangeLog evince-3.2.1.ebuild
@ 2011-12-04 4:34 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2011-12-04 4:34 UTC (permalink / raw
To: gentoo-commits
tetromino 11/12/04 04:34:41
Modified: evince-3.2.1-r1.ebuild ChangeLog
evince-3.2.1.ebuild
Log:
evince-3.x uses docbook-xml-dtd:4.3, not 4.1.2 (bug #392263, thanks to markus.heuberger@gmx.net for reporting).
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Revision Changes Path
1.3 app-text/evince/evince-3.2.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild?r1=1.2&r2=1.3
Index: evince-3.2.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evince-3.2.1-r1.ebuild 26 Nov 2011 02:45:45 -0000 1.2
+++ evince-3.2.1-r1.ebuild 4 Dec 2011 04:34:41 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.2 2011/11/26 02:45:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.3 2011/12/04 04:34:41 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -55,7 +55,7 @@
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.3.2
- ~app-text/docbook-xml-dtd-4.1.2
+ app-text/docbook-xml-dtd:4.3
>=dev-util/pkgconfig-0.9
sys-devel/gettext
>=dev-util/intltool-0.35
1.235 app-text/evince/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.235&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.235&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?r1=1.234&r2=1.235
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- ChangeLog 26 Nov 2011 02:45:45 -0000 1.234
+++ ChangeLog 4 Dec 2011 04:34:41 -0000 1.235
@@ -1,6 +1,11 @@
# ChangeLog for app-text/evince
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.234 2011/11/26 02:45:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.235 2011/12/04 04:34:41 tetromino Exp $
+
+ 04 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org> evince-3.2.1.ebuild,
+ evince-3.2.1-r1.ebuild:
+ evince-3.x uses docbook-xml-dtd:4.3, not 4.1.2 (bug #392263, thanks to
+ markus.heuberger@gmx.net for reporting).
26 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> evince-3.2.1.ebuild,
evince-3.2.1-r1.ebuild:
1.4 app-text/evince/evince-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-3.2.1.ebuild?r1=1.3&r2=1.4
Index: evince-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evince-3.2.1.ebuild 26 Nov 2011 02:45:45 -0000 1.3
+++ evince-3.2.1.ebuild 4 Dec 2011 04:34:41 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.3 2011/11/26 02:45:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.4 2011/12/04 04:34:41 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -52,7 +52,7 @@
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.3.2
- ~app-text/docbook-xml-dtd-4.1.2
+ app-text/docbook-xml-dtd:4.3
>=dev-util/pkgconfig-0.9
sys-devel/gettext
>=dev-util/intltool-0.35
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-04 4:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-26 2:45 [gentoo-commits] gentoo-x86 commit in app-text/evince: evince-3.2.1-r1.ebuild ChangeLog evince-3.2.1.ebuild Alexandre Rostovtsev (tetromino)
-- strict thread matches above, loose matches on Subject: below --
2011-12-04 4:34 Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox