jer 14/07/19 16:31:03 Modified: rubrica-2.1.6-r1.ebuild ChangeLog Log: EAPI bump. Integrate linguas_hu support better. Link properly against libm and libgthread. Fix GCONF schema (bug #353332). Clean up patches. Use a uniform patch filename format. Marked ~amd64 too. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.8 app-office/rubrica/rubrica-2.1.6-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild?r1=1.7&r2=1.8 Index: rubrica-2.1.6-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rubrica-2.1.6-r1.ebuild 3 May 2012 20:00:41 -0000 1.7 +++ rubrica-2.1.6-r1.ebuild 19 Jul 2014 16:31:03 -0000 1.8 @@ -1,32 +1,36 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.7 2012/05/03 20:00:41 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.8 2014/07/19 16:31:03 jer Exp $ -EAPI=2 -inherit eutils gnome2 +EAPI=5 +inherit autotools eutils gnome2 MY_PN=${PN}2 DESCRIPTION="A contact database for Gnome" -HOMEPAGE="http://rubrica.berlios.de/"; -SRC_URI="mirror://berlios/${PN}/${MY_PN}-${PV}.tar.bz2 - linguas_hu? ( mirror://gentoo/${P}-hu.po.bz2 )" - LICENSE="GPL-3" +HOMEPAGE="http://rubrica.berlios.de/"; SLOT="0" -KEYWORDS="x86" -IUSE="linguas_hu" +KEYWORDS="~amd64 x86" +SRC_URI=" + mirror://berlios/${PN}/${MY_PN}-${PV}.tar.bz2 + mirror://gentoo/${P}-hu.po.bz2 +" -RDEPEND="dev-libs/glib:2 +RDEPEND=" + dev-libs/glib:2 dev-libs/libxml2 >=gnome-base/libglade-2 gnome-base/gconf:2 x11-libs/gtk+:2 - x11-libs/libnotify" -DEPEND="${RDEPEND} + x11-libs/libnotify +" +DEPEND=" + ${RDEPEND} + >=sys-devel/gettext-0.16.1 dev-util/intltool virtual/pkgconfig - linguas_hu? ( >=sys-devel/gettext-0.16.1 )" +" S=${WORKDIR}/${MY_PN}-${PV} @@ -40,33 +44,20 @@ } src_prepare() { + mv "${WORKDIR}"/${P}-hu.po po/hu.po || die epatch "${FILESDIR}"/${P}-libnotify-0.7.patch - # False menu in locales - epatch "${FILESDIR}"/${P}_fix-menu-language.patch - # Missing gnome icons - epatch "${FILESDIR}"/${P}_missing-icons.patch - cd po - epatch "${FILESDIR}"/${P}_url-crash.patch -} - -src_compile() { - gnome2_src_compile - - # Add Hungarian translation - if use linguas_hu; then - msgfmt "${WORKDIR}"/${P}-hu.po --output-file po/hu.gmo || die - fi + epatch "${FILESDIR}"/${P}-fix-menu-language.patch + epatch "${FILESDIR}"/${P}-missing-icons.patch + epatch "${FILESDIR}"/${P}-url-crash.patch + epatch "${FILESDIR}"/${P}-linguas_hu.patch + epatch "${FILESDIR}"/${P}-libm.patch + epatch "${FILESDIR}"/${P}-gthread.patch + epatch "${FILESDIR}"/${P}-schema.patch + eautoreconf } src_install() { gnome2_src_install - domenu "${FILESDIR}"/${MY_PN}.desktop - - if use linguas_hu; then - domo po/hu.gmo || die - dosym ${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${MY_PN}.mo || die - fi - - find "${D}" -name '*.la' -exec rm -f '{}' + + prune_libtool_files } 1.18 app-office/rubrica/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/ChangeLog?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/ChangeLog?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/rubrica/ChangeLog?r1=1.17&r2=1.18 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ChangeLog 3 May 2012 20:00:41 -0000 1.17 +++ ChangeLog 19 Jul 2014 16:31:03 -0000 1.18 @@ -1,6 +1,20 @@ # ChangeLog for app-office/rubrica -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.17 2012/05/03 20:00:41 jdhore Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.18 2014/07/19 16:31:03 jer Exp $ + + 19 Jul 2014; Jeroen Roovers <j...@gentoo.org> rubrica-2.1.6-r1.ebuild, + +files/rubrica-2.1.6-fix-menu-language.patch, + +files/rubrica-2.1.6-gthread.patch, +files/rubrica-2.1.6-libm.patch, + files/rubrica-2.1.6-libnotify-0.7.patch, + +files/rubrica-2.1.6-linguas_hu.patch, + +files/rubrica-2.1.6-missing-icons.patch, +files/rubrica-2.1.6-schema.patch, + +files/rubrica-2.1.6-url-crash.patch, + -files/rubrica-2.1.6_fix-menu-language.patch, + -files/rubrica-2.1.6_missing-icons.patch, + -files/rubrica-2.1.6_url-crash.patch: + EAPI bump. Integrate linguas_hu support better. Link properly against libm + and libgthread. Fix GCONF schema (bug #353332). Clean up patches. Use a + uniform patch filename format. Marked ~amd64 too. 03 May 2012; Jeff Horelick <jdh...@gentoo.org> rubrica-2.1.6-r1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig
