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.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

11 files changed, 154 insertions, 60 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/Manifest b/app-office/rubrica/Manifest
index 3e37b7573945..14d3261db981 100644
--- a/app-office/rubrica/Manifest
+++ b/app-office/rubrica/Manifest
@@ -1,10 +1,24 @@
-AUX rubrica-2.1.6-libnotify-0.7.patch 799 SHA256 20262f02c4321863a90d8af97522bcb52290b91ee2b85dca6ae8de6526993b5b SHA512 c5174d20ebd90e25cdf18ca6317c4608c98db81cb1a3991c3a12d8770828dbb118dfeadff12954918d81d8310257de761d52e71dd483735aa099083ae5eef59d WHIRLPOOL ede1da2bb3734fb5707f00ac44b9f69978cfd98f3e02f4961d015a746cf7b5faa196ccdf8837d2e5547296a0ee495a08c933092cb123312bfe0dd6866805f85e
-AUX rubrica-2.1.6_fix-menu-language.patch 18304 SHA256 1ed1b12c7b830cf81858e211ed0136baa069bf7f2e92c1ef109fc4a40535334a SHA512 72722cb780d76786705e019778632f07f2ba3c7eb718511c89d7b8519f30db700119f28e5f5f2baa0376c4e0f0129c808700dba40fe71385562670a12ad06250 WHIRLPOOL 08cdcbf2ccbf1b73cd269f84993e43e513b3000fd6a5ac593f159c6715609cb454abaa95bd8e32fdfbd9e7e132f345a60374a1e7fb577c472be040b7edf66d45
-AUX rubrica-2.1.6_missing-icons.patch 1412 SHA256 28f76998c4ecba14b344559b9c2156297abd8d2c56a40ac66ff660dc15827d52 SHA512 6e53e4c939aec3c023cd277a6ff31fb5bee0f1a49e20c0ff0ef0656e51138cc3245dd2cc639547d20d55ced916fcbe1467ffef6ab75d93a04c48bf6b0fbeb9bd WHIRLPOOL 371465bf029875c88fc72fd5e67b217a56d6b569ec4edeacc860e4a2d70c9cd7a065f2dcc0f8c050adbcb98b8e2810918b69c0c1c7d800f71d58f5771fd0cd87
-AUX rubrica-2.1.6_url-crash.patch 1464 SHA256 abcc60a8b80f45ff1019b35a5ea2f80c7038b1b616622b29105656b044f7cd63 SHA512 f9acbf4b729775039049959e46b95acb47edbbe7cc30afdb875f30fc81e00b27be37d77d17ffb96a7afc4961f6e2feed20e697300276ce8cfd27ad22fad85b50 WHIRLPOOL 30b8fd8578400d99e55760634ee1d8b2cdefedcefae6869c1e59bec8babfcd8fd496a7eac543dd5d9b7e89fff530200898d8ceb32b016e92c63bf8e93de3bf70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX rubrica-2.1.6-fix-menu-language.patch 18166 SHA256 43582a2be6f107a8e36886c3e96bd7cce47a9ec7c94c917c6448dc5c49d55a7a SHA512 33301728366839de802da5b025cceec0aa90cdeeb25065d7302d8a5a7f2a20ed4cf70d31cab8daed5219a2e1f674bb116c58c2b12804f0d6de35bc7f89123afd WHIRLPOOL f81aeeb40847fcfba9859eaf722b2e39dde1347fa81ffe3d8f468f1a84ee3fda88723e57a1a8de55788557952109b3ecf176e63e642278d7641ea3ba6fcffab1
+AUX rubrica-2.1.6-gthread.patch 360 SHA256 55d747f99b8d7c05f7b03ed8864fb5188f8622d05e21e5cf55e9f873224786fb SHA512 720541fabad27d0906bae10b7fc1845a05069293a06b3c7b401026d7fee4cf83a41aa5d1b1d39b22e6bdf1bc7614819c4e007320f35d5019bbc7fc13f4b45190 WHIRLPOOL 42c50d61cdc82c86726bae4732e53968a74de7188e59a90953bf870a17ece7c57c52394c150b78a2cc61caa54d85555c94608192254859236e51ed7576ce2ec1
+AUX rubrica-2.1.6-libm.patch 561 SHA256 02a4e1d89b3ff89d98186866a28c00d3121e60d9eed577202e2c467e5933eaba SHA512 380025f6ba95ebef20aea12d20554b99548eb056f83243152ca9133101669df07e706d2c99d668ea5349214055bbfe0fb37f8af1bc1472fff38f2849332343f5 WHIRLPOOL 6897fe19063ec9bb94ffdc476261f5902164f869b2f986904211527ccce32b838f24aa8d0f7e242d4a32d8cbfe83de67d4d568a9b9aa55f60cf5af40daf28a93
+AUX rubrica-2.1.6-libnotify-0.7.patch 803 SHA256 a722c323e74c91e0ec66d9f1e29f3e6bf4f26d3f111984dda0a8b6d40f904c74 SHA512 7250495af83267c10ee6eba17d44bc7db2dc9e168f8fb148357d7ff6cc89ec6abc3a11f9392929f1d0875abf8567c7b9f49c808485a64c55e88832afeba93aef WHIRLPOOL dfe9dde0471e9c79cc2e7b74688984af5848b75856caae0db4e3361ed2caf0189a029257e1587e35f28db2c5771ba894b6ac7fd33cb229db982b1b3cd9aaab79
+AUX rubrica-2.1.6-linguas_hu.patch 211 SHA256 cd193a71aceec902169bc3dd0a4a5abdc13faf2228ece03b94d39c12154525d8 SHA512 8a7e2ea5e0f3482d891c0542fdfdb17207e57f8955f2be32a03c65d0a19f850044d8b15f58a2dfe0e7e54bb55a59dcfcbbfc2abba76c62d66e66da41981a0ece WHIRLPOOL ab2e4b5af2669781f8cb31c3a3ed30a3375c7e172dd0043b01fffd8b2b51570501f194a8b9a89573a088015c97937c7aaf9ed1d736aa694c61de8d1697b4c899
+AUX rubrica-2.1.6-missing-icons.patch 1276 SHA256 d3963d013ea556fa686c4e7f04ab775828f772bdc040cd9d4dbc32e48017491c SHA512 eacd16d7ec076dc215385475ba5c179486f152a864677de7dfb21c6dae7c1179def99ffd156eb51eaaf4a320a8c608f3f015a8737c338398d32b8a0e7695c4f4 WHIRLPOOL 4bf16120f86035d138dbbcb8774cd8dbc28270d151391b0f69bb355fbfb64375fb8c05bd74928fac9519f2602e0d6777a69e304c220516b602c387dffc4a786e
+AUX rubrica-2.1.6-schema.patch 885 SHA256 ca9962a285f68fc257664695590993032ed1fd42edeea9242af621afd3bfaff3 SHA512 ee729fb61c05712291e471129898587304d1fa64ec12ea517503b707af8c74e35a850779c8449d942d03df16d42a4f988af878f8404d25c2c1cc04b8f22f86b0 WHIRLPOOL 13c59fc14db07bc61d172b5726b1c4ea5740804f1e85655deb05b347c15afc8c16d7dba08ce5656889c83c27e6e9a8f2737d2d3e029fee96716e219b40a6dd94
+AUX rubrica-2.1.6-url-crash.patch 1330 SHA256 8d066c6c43bf545c05ba67c476d1dc79ea7560dbc672044ebdbcc2da82ba5b02 SHA512 f8b18b3361beddc865466892ae802fc8787f64aa5eda75295e5e244805cce0653582087a1a01840ead9a1a7428c143c6df6660764c3d4dff4080e6e72706d6bc WHIRLPOOL 603435e70a29461340ed3bc8170fc7314007fbcff6c5586f70c0d9e4711f6b508c79cb8ecd3a98cd1aca5ff30376688d9119ee51586cf82c4354e56ed4e6ca61
 AUX rubrica2.desktop 749 SHA256 f510a6feff6623c5faef51c8260872b285aa776da4db71ac0c40db48c196d017 SHA512 7d7121273649ff6f3371b4a86f3f29d53f414c45a7c8fca251a3a731257fbaeaf2b40b7f0f1b6c3391e5d6ef1c5920eda0390342b66641da768bfe71caac6b2f WHIRLPOOL c6f3e98dbd3ca5cf93e3e065867da67c2e95f2d8631bf1e91e65db194a045e07c257c27489131884fbdf903a1e7fd14c1a1ec167ee08e3285838696937ae8e91
 DIST rubrica-2.1.6-hu.po.bz2 9213 SHA256 d0d8cf32712d381d0eb8f875ccb250042ee783b0f7d7d73496885efb25caa9e1 SHA512 af467cdf44a9224ec8ff4e64a77dadfb3fed7601f7bfaa839c17ef59ed6eaa934a757f2472978ead7b3f1308fb1f91dfe4d5af1e7eed9e4e49ba3423b3deab25 WHIRLPOOL e4ccbc06901118ef64521c5251635d34ad6da41da4552a4047b0b84a7607b807084f2300fc455111c4ac76b23ae2efcd7ea2e095fa23dcdef9f425a07f3973c5
 DIST rubrica2-2.1.6.tar.bz2 710715 SHA256 4d9462243af4741e3571c9283f5a29ceb85a19c3dc1192148983c235a212dc9d SHA512 120d6007a6dc59e32b18b56d00d673dd8f3d2efb41508277a6672c82f28c2f8374694c7d87d9723b53bfd07e7e043de0d444899180d05dc81b936145f642701a WHIRLPOOL 8873dae853bd29ee2d9fc7454286a7f45bad25e587baf23471d07f08026f71f189c3c1ce7c08920670d34cf7c86b6b883c1223ff46a0d15c42a908eb3b903419
-EBUILD rubrica-2.1.6-r1.ebuild 1627 SHA256 9d0b5e4b2b092785b42e724e9708d04746154c26d69fea240faa3cb1e7f63cec SHA512 64e2cd4ec3343581d5edd51fac4cbc9cdb0f9c79dcd130e77742253608e2e660527873b85b39679b79affa68c58cc09a9bb7ac921e8abe84c3f9e35bef10b692 WHIRLPOOL 931b389096e60fff501966cbd71c0fc7a6de70cf5cd18b9e88b212faf2c94514a9dabd97a4957bb21f55406276d5399fa11c85986384038bd33085d03d5ea4c7
-MISC ChangeLog 2926 SHA256 2d98966700f8d9fee4b2c016a085d8d69107e21895d78bc0f20fb446155ce2e6 SHA512 8576b42ca5902cee099c46ec492bb1df79d1a71533001dc0553a3b3436edc954d1130b5a5190134a65e9c0b6bd61062b10917ff7ebc652fa4610b81335be754e WHIRLPOOL 69ece8e7c2313133d2ebce106f95f26cdb84c3be2eb510cfe022f0fbc19b5d3360872657187601a2388014bf4b6a0ec73958a129c220e38bcc7afa2c7794cc2d
+EBUILD rubrica-2.1.6-r1.ebuild 1453 SHA256 bcdd5f3451c807bceb98b9eb26c661b990aced373d8a63bdeb2d227b58b138ea SHA512 cbf6128758c339c612d34e8bc789dfb753a1206784d13cd21e586a71035feefb911ed45075d0b01dc0c52223f47e3e8d3230363ad941f21fa3d9930b6ddc9fb5 WHIRLPOOL 3e4abe927a648f495877e2380ab1bd97efb1266410ec6e21233d7b43856a78e61c7e50ab76b3aff96e70084db0907f77d685bf7875b476950e4f0f52324d1de0
+MISC ChangeLog 3653 SHA256 61f390e386b5c7239c49913aa28f3bcf0f972c8250a090a2424b79ad641af2f9 SHA512 2aefa8bed681b236faf01394be25d11b7fbce7016a591c0df267f2fcf2919590a37500f30a9ded766ea74d3c86b87fcc025685c497581931ed8b32325f2e7219 WHIRLPOOL 3c169d898eee7cf24dc42af9ea489a90cfbb527bdc5c5f1235302552d5447de2f977f2cf194987b0cb0c4300fd3c5436016c43b6848940b62cd0f713abc59043
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPKnUoACgkQVWmRsqeSphOrZQCeL4Qa673M5BTTvfo8gD+jBisJ
+XeoAnR52uNORrXlm4Rh0iB34oXHXwpNY
+=bToc
+-----END PGP SIGNATURE-----
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
 }