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)

10 files changed, 134 insertions, 54 deletions

diff --git a/app-office/rubrica/ChangeLog b/app-office/rubrica/ChangeLog
index 884f46cf45f1..8149c8c7c6a4 100644
--- a/app-office/rubrica/ChangeLog
+++ b/app-office/rubrica/ChangeLog
@@ -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 <jer@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 <jdhore@gentoo.org> rubrica-2.1.6-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-office/rubrica/files/rubrica-2.1.6_fix-menu-language.patch b/app-office/rubrica/files/rubrica-2.1.6-fix-menu-language.patch
index d152d0b8b1a2..6647f5e2c28d 100755..100644
--- a/app-office/rubrica/files/rubrica-2.1.6_fix-menu-language.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-fix-menu-language.patch
@@ -1,5 +1,5 @@
---- org/de.po	2008-09-03 23:41:02.000000000 +0200
-+++ po/de.po	2008-09-04 01:51:15.000000000 +0200
+--- a/po/de.po
++++ b/po/de.po
 @@ -4,7 +4,7 @@
  "Project-Id-Version: Rubrica 2.0rc1\n"
  "Report-Msgid-Bugs-To: \n"
@@ -680,8 +680,8 @@
  
  #: ../rubrica2.schemas.in.h:10
  msgid "Rubrica will make a backup of addressbooks before overwrite them"
---- org/fr.po	2008-09-03 23:41:02.000000000 +0200
-+++ po/fr.po	2008-09-04 12:32:32.000000000 +0200
+--- a/po/fr.po
++++ b/po/fr.po
 @@ -4,7 +4,7 @@
  "Project-Id-Version: Rubrica 2.0.1\n"
  "Report-Msgid-Bugs-To: \n"
diff --git a/app-office/rubrica/files/rubrica-2.1.6-gthread.patch b/app-office/rubrica/files/rubrica-2.1.6-gthread.patch
new file mode 100644
index 000000000000..564f01a13eb8
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-gthread.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -114,7 +114,7 @@
+ AC_SUBST(LIBRAL_LIBS)
+ AC_SUBST(LIBRAL_CFLAGS)
+ 
+-PKG_CHECK_MODULES(RUBRICA, gtk+-2.0 >= 2.6 glib-2.0 >= 2.6 libglade-2.0 gconf-2.0 libnotify)
++PKG_CHECK_MODULES(RUBRICA, gtk+-2.0 >= 2.6 glib-2.0 >= 2.6 gthread-2.0 libglade-2.0 gconf-2.0 libnotify)
+ AC_SUBST(RUBRICA_LIBS)
+ AC_SUBST(RUBRICA_CFLAGS)
+ 
diff --git a/app-office/rubrica/files/rubrica-2.1.6-libm.patch b/app-office/rubrica/files/rubrica-2.1.6-libm.patch
new file mode 100644
index 000000000000..b7d239fae58e
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-libm.patch
@@ -0,0 +1,24 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -110,7 +110,7 @@
+ 
+ 
+ 
+-rubrica2_LDADD = $(top_builddir)/libral/libral.la $(RUBRICA_LIBS) $(LIBRAL_LIBS)
++rubrica2_LDADD = $(top_builddir)/libral/libral.la $(RUBRICA_LIBS) $(LIBRAL_LIBS) $(LIBM)
+ 
+ 
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -102,6 +102,10 @@
+ AC_DEFINE_UNQUOTED(RUBRICA_CAP_NAME, "$RUBRICA_CAP_NAME", The program name with capital initial letter)
+ AC_DEFINE_UNQUOTED(RUBRICA_VERSION, "$RUBRICA_VERSION", The program version)
+ 
++dnl
++dnl libm
++LT_LIB_M
++dnl
+ 
+ dnl
+ dnl Start of pkg-config checks
diff --git a/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch b/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
index 9ab854aff20a..a2e2fca3cfd1 100644
--- a/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
@@ -1,5 +1,5 @@
---- src/app.c
-+++ src/app.c
+--- a/src/app.c
++++ b/src/app.c
 @@ -1338,8 +1338,15 @@
    self->priv->statusbar      = rubrica_statusbar_new();
    
diff --git a/app-office/rubrica/files/rubrica-2.1.6-linguas_hu.patch b/app-office/rubrica/files/rubrica-2.1.6-linguas_hu.patch
new file mode 100644
index 000000000000..d3a8b454e026
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-linguas_hu.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -116,7 +116,7 @@
+ 
+ 
+ dnl Add the languages which your application supports here.
+-ALL_LINGUAS="it uk de fr ru"
++ALL_LINGUAS="de fr hu it ru uk"
+ AM_GLIB_GNU_GETTEXT
+ 
+ 
diff --git a/app-office/rubrica/files/rubrica-2.1.6_missing-icons.patch b/app-office/rubrica/files/rubrica-2.1.6-missing-icons.patch
index 09928eb8b24d..17eef8af1baf 100755..100644
--- a/app-office/rubrica/files/rubrica-2.1.6_missing-icons.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-missing-icons.patch
@@ -1,5 +1,5 @@
---- org/app.c	2008-09-04 19:43:43.000000000 +0200
-+++ src/app.c	2008-09-04 19:51:38.000000000 +0200
+--- a/src/app.c
++++ b/src/app.c
 @@ -59,13 +59,13 @@
    {"all",                      "all groups",    N_("all groups")   },
  
@@ -16,8 +16,8 @@
    {"applications-multimedia",  "hobbies",       N_("hobbies")      },
    {"sport",                    "sport",         N_("sport")        },
  
---- org/callbacks.c	2008-09-06 15:02:19.000000000 +0200
-+++ src/callbacks.c	2008-09-06 15:04:36.000000000 +0200
+--- a/src/callbacks.c
++++ b/src/callbacks.c
 @@ -597,7 +597,8 @@
      "Ukrainian Iryna Rtveliashvili <irina.rtv@mail.ru>\n"
      "Deutsch Christian Faulhammer <christian@faulhammer.org>\n"
diff --git a/app-office/rubrica/files/rubrica-2.1.6-schema.patch b/app-office/rubrica/files/rubrica-2.1.6-schema.patch
new file mode 100644
index 000000000000..20f4ee866d11
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-schema.patch
@@ -0,0 +1,29 @@
+--- a/rubrica2.schemas.in
++++ b/rubrica2.schemas.in
+@@ -6,7 +6,7 @@
+ 		<applyto>/apps/rubrica2/file_format</applyto>
+ 		<owner>rubrica</owner>
+ 		<type>int</type>
+-		<default>@FILE_FORMAT@</default>
++		<default>@RUBRICA_FILE_FORMAT@</default>
+ 		<locale name="C">
+         		<short>rubrica file format</short>
+       		</locale>
+@@ -88,7 +88,7 @@
+ 		<key>/schemas/apps/rubrica2/file/load_files</key>
+ 		<applyto>/apps/rubrica2/file/load_files</applyto>
+ 		<owner>rubrica</owner>
+-		<type>boolean</type>
++		<type>bool</type>
+ 		<default>false</default>
+ 		<locale name="C">
+ 			<short>Load addressbooks on startup</short>
+@@ -100,7 +100,7 @@
+ 		<applyto>/apps/rubrica2/file/files</applyto>
+ 		<owner>rubrica</owner>
+ 		<type>list</type>
+-		<default></default>
++		<list_type>string</list_type>
+ 		<locale name="C">
+ 			<short>Files that rubrica will open at startup</short>
+ 		</locale>
diff --git a/app-office/rubrica/files/rubrica-2.1.6_url-crash.patch b/app-office/rubrica/files/rubrica-2.1.6-url-crash.patch
index 97a20f3260af..1d8bebbb888c 100644
--- a/app-office/rubrica/files/rubrica-2.1.6_url-crash.patch
+++ b/app-office/rubrica/files/rubrica-2.1.6-url-crash.patch
@@ -1,5 +1,5 @@
---- de.po.orig	2008-10-17 20:08:33.000000000 +0200
-+++ de.po	2008-10-17 20:10:55.000000000 +0200
+--- a/po/de.po
++++ b/po/de.po
 @@ -4,7 +4,7 @@
  "Project-Id-Version: Rubrica 2.0rc1\n"
  "Report-Msgid-Bugs-To: \n"
@@ -18,8 +18,8 @@
  
  #: ../src/app.c:742 ../rubrica2.desktop.in.h:2
  msgid "Rubrica Addressbook"
---- fr.po.orig	2008-10-17 20:08:40.000000000 +0200
-+++ fr.po	2008-10-17 20:11:17.000000000 +0200
+--- a/po/fr.po
++++ b/po/fr.po
 @@ -4,7 +4,7 @@
  "Project-Id-Version: Rubrica 2.0.1\n"
  "Report-Msgid-Bugs-To: \n"
diff --git a/app-office/rubrica/rubrica-2.1.6-r1.ebuild b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
index 1c514f568199..52f7b9773ceb 100644
--- a/app-office/rubrica/rubrica-2.1.6-r1.ebuild
+++ b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
@@ -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"
-
-RDEPEND="dev-libs/glib:2
+KEYWORDS="~amd64 x86"
+SRC_URI="
+	mirror://berlios/${PN}/${MY_PN}-${PV}.tar.bz2
+	mirror://gentoo/${P}-hu.po.bz2
+"
+
+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 @@ pkg_setup() {
 }
 
 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
 }