| 1 |
ssuominen 11/01/30 18:24:49 |
| 2 |
|
| 3 |
Modified: ChangeLog rubrica-2.1.6-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix building with x11-libs/libnotify >= 0.7. Remove useless .la files. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.15 app-office/rubrica/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/ChangeLog?rev=1.15&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/ChangeLog?rev=1.15&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/ChangeLog?r1=1.14&r2=1.15 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v |
| 19 |
retrieving revision 1.14 |
| 20 |
retrieving revision 1.15 |
| 21 |
diff -u -r1.14 -r1.15 |
| 22 |
--- ChangeLog 17 Dec 2010 16:27:20 -0000 1.14 |
| 23 |
+++ ChangeLog 30 Jan 2011 18:24:48 -0000 1.15 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-office/rubrica |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.14 2010/12/17 16:27:20 fauli Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.15 2011/01/30 18:24:48 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 30 Jan 2011; Samuli Suominen <ssuominen@g.o> rubrica-2.1.6-r1.ebuild, |
| 32 |
+ +files/rubrica-2.1.6-libnotify-0.7.patch: |
| 33 |
+ Fix building with x11-libs/libnotify >= 0.7. Remove useless .la files. |
| 34 |
|
| 35 |
17 Dec 2010; Christian Faulhammer <fauli@g.o> metadata.xml: |
| 36 |
Drop maintainership |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.5 app-office/rubrica/rubrica-2.1.6-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild?rev=1.5&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild?rev=1.5&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild?r1=1.4&r2=1.5 |
| 45 |
|
| 46 |
Index: rubrica-2.1.6-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v |
| 49 |
retrieving revision 1.4 |
| 50 |
retrieving revision 1.5 |
| 51 |
diff -u -r1.4 -r1.5 |
| 52 |
--- rubrica-2.1.6-r1.ebuild 20 Jun 2009 23:22:05 -0000 1.4 |
| 53 |
+++ rubrica-2.1.6-r1.ebuild 30 Jan 2011 18:24:48 -0000 1.5 |
| 54 |
@@ -1,10 +1,9 @@ |
| 55 |
-# Copyright 1999-2009 Gentoo Foundation |
| 56 |
+# Copyright 1999-2011 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.4 2009/06/20 23:22:05 flameeyes Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.5 2011/01/30 18:24:48 ssuominen Exp $ |
| 60 |
|
| 61 |
-EAPI=1 |
| 62 |
- |
| 63 |
-inherit gnome2 eutils |
| 64 |
+EAPI=2 |
| 65 |
+inherit eutils gnome2 |
| 66 |
|
| 67 |
MY_PN=${PN}2 |
| 68 |
|
| 69 |
@@ -13,34 +12,41 @@ |
| 70 |
SRC_URI="mirror://berlios/${PN}/${MY_PN}-${PV}.tar.bz2 |
| 71 |
linguas_hu? ( mirror://gentoo/${P}-hu.po.bz2 )" |
| 72 |
|
| 73 |
-IUSE="linguas_hu" |
| 74 |
+LICENSE="GPL-3" |
| 75 |
SLOT="0" |
| 76 |
KEYWORDS="~x86" |
| 77 |
-LICENSE="GPL-3" |
| 78 |
- |
| 79 |
-DOCS="AUTHORS ChangeLog CREDITS INSTALL NEWS README TODO" |
| 80 |
-S=${WORKDIR}/${MY_PN}-${PV}/ |
| 81 |
+IUSE="linguas_hu" |
| 82 |
|
| 83 |
-RDEPEND="dev-libs/libxml2 |
| 84 |
- gnome-base/libglade |
| 85 |
+RDEPEND="dev-libs/glib:2 |
| 86 |
+ dev-libs/libxml2 |
| 87 |
+ >=gnome-base/libglade-2 |
| 88 |
gnome-base/gconf:2 |
| 89 |
- dev-perl/XML-Parser |
| 90 |
- x11-libs/libnotify |
| 91 |
- linguas_hu? ( >=sys-devel/gettext-0.16.1 )" |
| 92 |
- |
| 93 |
+ x11-libs/gtk+:2 |
| 94 |
+ x11-libs/libnotify" |
| 95 |
DEPEND="${RDEPEND} |
| 96 |
- dev-util/pkgconfig" |
| 97 |
+ dev-util/intltool |
| 98 |
+ dev-util/pkgconfig |
| 99 |
+ linguas_hu? ( >=sys-devel/gettext-0.16.1 )" |
| 100 |
+ |
| 101 |
+S=${WORKDIR}/${MY_PN}-${PV} |
| 102 |
+ |
| 103 |
+pkg_setup() { |
| 104 |
+ G2CONF="${G2CONF} |
| 105 |
+ --disable-dependency-tracking |
| 106 |
+ --disable-static |
| 107 |
+ --with-html-dir=/usr/share/doc/${PF}/html" |
| 108 |
|
| 109 |
-src_unpack() { |
| 110 |
- gnome2_src_unpack |
| 111 |
- cd "${S}" |
| 112 |
+ DOCS="AUTHORS ChangeLog CREDITS NEWS README TODO" |
| 113 |
+} |
| 114 |
|
| 115 |
+src_prepare() { |
| 116 |
+ epatch "${FILESDIR}"/${P}-libnotify-0.7.patch |
| 117 |
# False menu in locales |
| 118 |
- epatch "${FILESDIR}/${P}_fix-menu-language.patch" |
| 119 |
+ epatch "${FILESDIR}"/${P}_fix-menu-language.patch |
| 120 |
# Missing gnome icons |
| 121 |
- epatch "${FILESDIR}/${P}_missing-icons.patch" |
| 122 |
- cd "${S}/po" |
| 123 |
- epatch "${FILESDIR}/${P}_url-crash.patch" |
| 124 |
+ epatch "${FILESDIR}"/${P}_missing-icons.patch |
| 125 |
+ cd po |
| 126 |
+ epatch "${FILESDIR}"/${P}_url-crash.patch |
| 127 |
} |
| 128 |
|
| 129 |
src_compile() { |
| 130 |
@@ -48,16 +54,19 @@ |
| 131 |
|
| 132 |
# Add Hungarian translation |
| 133 |
if use linguas_hu; then |
| 134 |
- msgfmt "${WORKDIR}/${P}-hu.po" --output-file "po/hu.gmo" || die |
| 135 |
+ msgfmt "${WORKDIR}"/${P}-hu.po --output-file po/hu.gmo || die |
| 136 |
fi |
| 137 |
} |
| 138 |
|
| 139 |
src_install() { |
| 140 |
gnome2_src_install |
| 141 |
|
| 142 |
- domenu "${FILESDIR}/${MY_PN}.desktop" |
| 143 |
+ domenu "${FILESDIR}"/${MY_PN}.desktop |
| 144 |
+ |
| 145 |
if use linguas_hu; then |
| 146 |
domo po/hu.gmo || die |
| 147 |
- dosym "${PN}.mo" "/usr/share/locale/hu/LC_MESSAGES/${MY_PN}.mo" |
| 148 |
+ dosym ${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${MY_PN}.mo || die |
| 149 |
fi |
| 150 |
+ |
| 151 |
+ find "${D}" -name '*.la' -exec rm -f '{}' + |
| 152 |
} |
Archives