Fix compilation with gettext-0.15, patch provided by Ed Catmur #143120

Package-Manager: portage-2.1.1_pre5-r1

2 files changed, 26 insertions, 22 deletions

diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index a07b566a6822..d94ce6e212c9 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,21 +1,28 @@
-AUX meld-1.0.0-frpo.patch 377 RMD160 abb6c33943585bca10ca4d05989dfcc25717bf55 SHA1 f9f7ebf30dc6720cc4048e9d7b1cccabf0347bc7 SHA256 35f4c08a692f5c7c0c9cd5983924ea6466dd0f6eba104eece52a2ae43a9a2a16
-MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377
-RMD160 abb6c33943585bca10ca4d05989dfcc25717bf55 files/meld-1.0.0-frpo.patch 377
-SHA256 35f4c08a692f5c7c0c9cd5983924ea6466dd0f6eba104eece52a2ae43a9a2a16 files/meld-1.0.0-frpo.patch 377
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fix-po.patch 4005 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 SHA1 d2c84e9db6971f8cd23787e0dda53f09c8f17e56 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b
+MD5 3ec863ae5648587f525dddd4cc614557 files/fix-po.patch 4005
+RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 files/fix-po.patch 4005
+SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b files/fix-po.patch 4005
+AUX fix-po.patch.orig 4032 RMD160 c9bffce3122a0ca642c176264e5b63fd6ac91e04 SHA1 dfc6bb99f0984723fe06fdd4bf1288923467399f SHA256 1e7a40bb1c4c2a48f7c71c20ed41816127edafa1bf75a7b43b4fb828251c3d0f
+MD5 589cb30285b4d8d830e6922ae9010f47 files/fix-po.patch.orig 4032
+RMD160 c9bffce3122a0ca642c176264e5b63fd6ac91e04 files/fix-po.patch.orig 4032
+SHA256 1e7a40bb1c4c2a48f7c71c20ed41816127edafa1bf75a7b43b4fb828251c3d0f files/fix-po.patch.orig 4032
 DIST meld-1.1.3.tar.bz2 597967 RMD160 43134e32b33aa2f5a405c4ad2ba90eb22b632fbc SHA1 e7f17e8426f29aa448cfed306dccb00ac0a3e43b SHA256 0494636661aadf07520e6d75c986a53af136b6d6c4e71bdcb9dde01554dcbdb9
 DIST meld-1.1.4.tar.bz2 599912 RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa SHA1 52f51e5825b4e2bb56594a9f4e180908e714848f SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f
 EBUILD meld-1.1.3.ebuild 1550 RMD160 1b314cb259132acec47fab6bd1e6a2443c22e91b SHA1 3afed2e3e0f58512c2451bede85129b0e4b8dac3 SHA256 ce513af076674d02387abf8616f8397c9c88381f149a4159bdb2ba6959ee33a4
 MD5 6864d95974956f1a6f38e56f4835066c meld-1.1.3.ebuild 1550
 RMD160 1b314cb259132acec47fab6bd1e6a2443c22e91b meld-1.1.3.ebuild 1550
 SHA256 ce513af076674d02387abf8616f8397c9c88381f149a4159bdb2ba6959ee33a4 meld-1.1.3.ebuild 1550
-EBUILD meld-1.1.4.ebuild 1556 RMD160 874face12060b83c623df26a3571531c904c4037 SHA1 1b9b798d6173a3d9a097e21efbc58b441272405b SHA256 628f81b7d89dfa54faa15786699bf1904d95c9f55ec70426b6998cfd3026e7bc
-MD5 df0f59bed5a1c6c3c5221b35389e8193 meld-1.1.4.ebuild 1556
-RMD160 874face12060b83c623df26a3571531c904c4037 meld-1.1.4.ebuild 1556
-SHA256 628f81b7d89dfa54faa15786699bf1904d95c9f55ec70426b6998cfd3026e7bc meld-1.1.4.ebuild 1556
-MISC ChangeLog 6247 RMD160 9f396042a425a41ee8b5ca7ba7dad847d91122bc SHA1 dbc52e90116180c8619d5b12ff6269a6b1c54938 SHA256 733651c8f06d9f2ad685e8407007155009b1797f775ffd5e244b07c47cc517ac
-MD5 d05beeb904c2f64f89ddaa6ede7a57cb ChangeLog 6247
-RMD160 9f396042a425a41ee8b5ca7ba7dad847d91122bc ChangeLog 6247
-SHA256 733651c8f06d9f2ad685e8407007155009b1797f775ffd5e244b07c47cc517ac ChangeLog 6247
+EBUILD meld-1.1.4.ebuild 1649 RMD160 9989e300dc4030a160f93e09a6cdcdb17784e816 SHA1 490f765cdb97fd812c4a832606a177a2f3923da5 SHA256 ca4ea38189bef61c69e7512954422e5f477e3d98721b24c25573e1aa25fcbcb6
+MD5 0b974725062058393c35e95def5294ab meld-1.1.4.ebuild 1649
+RMD160 9989e300dc4030a160f93e09a6cdcdb17784e816 meld-1.1.4.ebuild 1649
+SHA256 ca4ea38189bef61c69e7512954422e5f477e3d98721b24c25573e1aa25fcbcb6 meld-1.1.4.ebuild 1649
+MISC ChangeLog 6442 RMD160 5136db647e5d412855cf9373873742bc59adcd76 SHA1 b7786acf587edd1e10c577159022e9a8318a7fee SHA256 6b10380535225a446d8feb7383d748dd0e336d7d85344a5902f57726fc97a713
+MD5 b10f2864948f0d51ea5789dc8e5358c2 ChangeLog 6442
+RMD160 5136db647e5d412855cf9373873742bc59adcd76 ChangeLog 6442
+SHA256 6b10380535225a446d8feb7383d748dd0e336d7d85344a5902f57726fc97a713 ChangeLog 6442
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -26,3 +33,10 @@ SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/di
 MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4 235
 RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4 235
 SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFFBZvrJrHF4yAQTrARAtQrAKDImxNhcptnu+c6DOvSv5CVozg6FQCeMxzV
+1nyMcYkwgz1AGo255aLSB60=
+=0KNX
+-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/files/meld-1.0.0-frpo.patch b/dev-util/meld/files/meld-1.0.0-frpo.patch
deleted file mode 100644
index 4f8528563f09..000000000000
--- a/dev-util/meld/files/meld-1.0.0-frpo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- meld-1.0.0.old/po/fr.po	2005-07-03 18:41:20.000000000 -0400
-+++ meld-1.0.0/po/fr.po	2005-07-03 18:40:45.000000000 -0400
-@@ -15,6 +15,7 @@
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Generated-By: pygettext.py 1.5\n"
-+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
- 
- #: ../meld.desktop.in.h:1
- msgid "Compare and merge your files."