[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/, media-libs/libwmf/files/

2024-09-13 Thread Petr Vaněk
commit: f7f966286bd92875d9cbc5dfd8c1f14ecbbbfd17
Author: Petr Vaněk  gentoo  org>
AuthorDate: Fri Sep 13 15:12:12 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Fri Sep 13 15:19:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f96628

media-libs/libwmf: drop 0.2.8.4-r9

Signed-off-by: Petr Vaněk  gentoo.org>

 media-libs/libwmf/Manifest |   1 -
 ...ibwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch | 118 -
 .../files/libwmf-0.2.8.4-CVE-2015-4695.patch   |  56 --
 .../files/libwmf-0.2.8.4-CVE-2015-4696.patch   |  23 
 .../libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch   |  25 -
 .../libwmf/files/libwmf-0.2.8.4-intoverflow.patch  |  27 -
 .../libwmf-0.2.8.4-use-freetype2-pkg-config.patch  |  67 
 .../files/libwmf-0.2.8.4-use-system-fonts.patch|  39 ---
 media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild | 101 --
 9 files changed, 457 deletions(-)

diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 765c69762970..948d7d1127a9 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1,2 +1 @@
 DIST libwmf-0.2.13.tar.gz 3044235 BLAKE2B 
0cfbc94d6e7d52c5ecf09b277cf536f56ec54d3b53845e80afdfe4aa3b397562bffd198fb51726d210f21e3e9e16650f85e9188f4e5303b5c4c8b917ef882040
 SHA512 
f45a936c9bc98fc1a5f2b0808b497119e4dcd3c132615fdddb7583e5719c7d1d7f85c16ebf313cad453e5b7ae3508bf6b80c4ed2b42322b7dec295d8f4eb86ce
-DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B 
d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe
 SHA512 
d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5

diff --git 
a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch 
b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
deleted file mode 100644
index e8ba8db1e843..
--- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
+++ /dev/null
@@ -1,118 +0,0 @@
 libwmf-0.2.8.4/src/ipa/ipa/bmp.h   2015-06-08 14:46:24.591876404 +0100
-+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h   2015-06-08 14:46:35.345993247 +0100
-@@ -859,7 +859,7 @@
- %
- %
- */
--static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int 
compression,unsigned char* pixels)
-+static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int 
compression,unsigned char* pixels)
- { int byte;
-   int count;
-   int i;
-@@ -870,12 +870,14 @@
-   U32 u;
- 
-   unsigned char* q;
-+  unsigned char* end;
- 
-   for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] 
= 0;
- 
-   byte = 0;
-   x = 0;
-   q = pixels;
-+  end = pixels + bmp->width * bmp->height;
- 
-   for (y = 0; y < bmp->height; )
-   {   count = ReadBlobByte (src);
-@@ -884,7 +886,10 @@
-   {   /* Encoded mode. */
-   byte = ReadBlobByte (src);
-   for (i = 0; i < count; i++)
--  {   if (compression == 1)
-+  {   
-+  if (q == end)
-+  return 0;
-+  if (compression == 1)
-   {   (*(q++)) = (unsigned char) byte;
-   }
-   else
-@@ -896,13 +901,15 @@
-   else
-   {   /* Escape mode. */
-   count = ReadBlobByte (src);
--  if (count == 0x01) return;
-+  if (count == 0x01) return 1;
-   switch (count)
-   {
-   case 0x00:
-{  /* End of line. */
-   x = 0;
-   y++;
-+  if (y >= bmp->height)
-+  return 0;
-   q = pixels + y * bmp->width;
-   break;
-}
-@@ -910,13 +917,20 @@
-{  /* Delta mode. */
-   x += ReadBlobByte (src);
-   y += ReadBlobByte (src);
-+  if (y >= bmp->height)
-+  return 0;
-+  if (x >= bmp->width)
-+  return 0;
-   q = pixels + y * bmp->width + x;
-   break;
-}
-   default:
-{  /* Absolute mode. */
-   for (i = 0; i < count; i++)
--  {   if (compression == 1)
-+ 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2024-09-13 Thread Petr Vaněk
commit: 3b8422357a20bb0fe53478e1487435be461a3355
Author: Petr Vaněk  gentoo  org>
AuthorDate: Fri Sep 13 15:15:18 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Fri Sep 13 15:19:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b842235

media-libs/libwmf: update HOMEPAGE

Signed-off-by: Petr Vaněk  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 34d9e1951968..5962fe96d395 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 inherit autotools gnome2-utils
 
 DESCRIPTION="A library for reading vector images in Microsoft's Windows 
Metafile Format (WMF)"
-HOMEPAGE="https://github.com/caolanm/libwmf http://wvware.sourceforge.net/";
+HOMEPAGE="
+   https://github.com/caolanm/libwmf
+   https://wvware.sourceforge.net/
+"
 SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2024-02-06 Thread Michał Górny
commit: 6b3b4b0503f2d01f4e2c5de43f14edcd09166a71
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Feb  6 10:15:59 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Feb  6 11:02:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3b4b05

media-libs/libwmf: Remove obsolete gnome2_gdk_pixbuf_savelist call

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild  | 6 +-
 media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild | 6 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index f069d923c6ce..228cca001f7f 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -80,10 +80,6 @@ src_install() {
find "${D}" -name '*.la' -delete || die
 }
 
-pkg_preinst() {
-   gnome2_gdk_pixbuf_savelist
-}
-
 pkg_postinst() {
gnome2_gdk_pixbuf_update
 }

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
index 8f25fa6a80ab..8d3fb04b51be 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -92,10 +92,6 @@ src_install() {
find "${D}" -name '*.la' -delete || die
 }
 
-pkg_preinst() {
-   gnome2_gdk_pixbuf_savelist
-}
-
 pkg_postinst() {
gnome2_gdk_pixbuf_update
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-05-29 Thread Sam James
commit: 7449f882cfee1bfa24232a974728079289b13822
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 20:18:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 20:18:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7449f882

media-libs/libwmf: Stabilize 0.2.13-r1 arm64, #907147

Signed-off-by: Sam James  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 68fb30c88d1e..7f92399b1930 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-05-28 Thread Arthur Zamarin
commit: f249040d8862ecf5d31e58f686b4e3da65359e26
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun May 28 19:10:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun May 28 19:10:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f249040d

media-libs/libwmf: Stabilize 0.2.13-r1 sparc, #907147

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 435a74583e7d..68fb30c88d1e 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-05-27 Thread Arthur Zamarin
commit: 4b7941f7b4de9aab256cc707956c5f0c46dffb41
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 27 11:15:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 27 11:15:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7941f7

media-libs/libwmf: Stabilize 0.2.13-r1 ppc, #907147

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 2b965b8f518c..435a74583e7d 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-05-27 Thread Sam James
commit: d513834ac0d4b538276a16880356197a1f413c85
Author: Sam James  gentoo  org>
AuthorDate: Sat May 27 10:29:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 27 10:29:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d513834a

media-libs/libwmf: Stabilize 0.2.13-r1 ppc64, #907147

Signed-off-by: Sam James  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index be3b07ab8a44..2b965b8f518c 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-05-25 Thread Arthur Zamarin
commit: d9fbd81d16038854934c98969c4583a0adccdaf5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 25 08:02:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 25 08:02:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9fbd81d

media-libs/libwmf: Stabilize 0.2.13-r1 x86, #907147

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index f619706d72c5..2be397b0fb2d 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-05-25 Thread Arthur Zamarin
commit: dc2ec5ed855f55ab46da2cbe0a12def49f42bd3a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 25 08:02:23 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 25 08:02:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2ec5ed

media-libs/libwmf: Stabilize 0.2.13-r1 amd64, #907147

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 2be397b0fb2d..be3b07ab8a44 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-05-25 Thread Arthur Zamarin
commit: bb2efdf5c4eb62172009d1fc30abcb517bb41d36
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 25 07:56:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 25 07:56:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb2efdf5

media-libs/libwmf: Stabilize 0.2.13-r1 arm, #907147

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 5c0afaef42ab..f619706d72c5 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-04-17 Thread Sam James
commit: f799a00525182088ea3f6479dab5fe2ab6a869a4
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 18 04:38:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 18 04:38:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f799a005

media-libs/libwmf: add unstaged fixups

Signed-off-by: Sam James  gentoo.org>

 ...ibwmf-0.2.13.ebuild => libwmf-0.2.13-r1.ebuild} | 25 --
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.13.ebuild 
b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
similarity index 83%
rename from media-libs/libwmf/libwmf-0.2.13.ebuild
rename to media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 46d011d65fc0..5c0afaef42ab 100644
--- a/media-libs/libwmf/libwmf-0.2.13.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -9,33 +9,36 @@ DESCRIPTION="A library for reading vector images in 
Microsoft's Windows Metafile
 HOMEPAGE="https://github.com/caolanm/libwmf http://wvware.sourceforge.net/";
 SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="debug doc expat X"
 
-RDEPEND="app-text/ghostscript-gpl
+RDEPEND="
+   app-text/ghostscript-gpl
media-fonts/urw-fonts
media-libs/freetype:2=
-   media-libs/libpng:0=
+   media-libs/libpng:=
+   media-libs/libjpeg-turbo
sys-libs/zlib:=
x11-libs/gdk-pixbuf:2
-   virtual/jpeg:0=
expat? ( dev-libs/expat )
!expat? ( dev-libs/libxml2:2= )
-   X? ( x11-libs/libX11
+   X? (
+   x11-libs/libX11
x11-libs/libXt
-   x11-libs/libXpm )"
-
+   x11-libs/libXpm
+   )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" 
"TODO" )
+DOCS=( AUTHORS BUILDING ChangeLog CREDITS INSTALL NEWS README TODO )
 
 PATCHES=(
-"${FILESDIR}"/${PN}-0.2.8.4-build.patch
-"${FILESDIR}"/${PN}-0.2.8.4-libpng-1.5.patch
-"${FILESDIR}"/${PN}-0.2.8.4-pngfix.patch
+   "${FILESDIR}"/${PN}-0.2.8.4-build.patch
+   "${FILESDIR}"/${PN}-0.2.8.4-libpng-1.5.patch
+   "${FILESDIR}"/${PN}-0.2.8.4-pngfix.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-04-17 Thread Sam James
commit: b93ba4623f61d3330909c67a17a1809e6ca0c0c3
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 18 04:11:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 18 04:11:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b93ba462

media-libs/libwmf: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 media-libs/libwmf/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/libwmf/metadata.xml b/media-libs/libwmf/metadata.xml
index eac3ad7e3d51..ff96f25bf534 100644
--- a/media-libs/libwmf/metadata.xml
+++ b/media-libs/libwmf/metadata.xml
@@ -5,5 +5,6 @@

https://sourceforge.net/p/wvware/bugs/
wvware
+   caolanm/libwmf

 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2023-04-17 Thread Sam James
commit: 4a2750e9d8ea819974f2f585f03e0540d729881e
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 18 04:11:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 18 04:11:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2750e9

media-libs/libwmf: add 0.2.13

Signed-off-by: Sam James  gentoo.org>

 media-libs/libwmf/Manifest |  1 +
 media-libs/libwmf/libwmf-0.2.13.ebuild | 90 ++
 2 files changed, 91 insertions(+)

diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 2c2c1bd12f62..765c69762970 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1 +1,2 @@
+DIST libwmf-0.2.13.tar.gz 3044235 BLAKE2B 
0cfbc94d6e7d52c5ecf09b277cf536f56ec54d3b53845e80afdfe4aa3b397562bffd198fb51726d210f21e3e9e16650f85e9188f4e5303b5c4c8b917ef882040
 SHA512 
f45a936c9bc98fc1a5f2b0808b497119e4dcd3c132615fdddb7583e5719c7d1d7f85c16ebf313cad453e5b7ae3508bf6b80c4ed2b42322b7dec295d8f4eb86ce
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B 
d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe
 SHA512 
d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5

diff --git a/media-libs/libwmf/libwmf-0.2.13.ebuild 
b/media-libs/libwmf/libwmf-0.2.13.ebuild
new file mode 100644
index ..46d011d65fc0
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.13.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A library for reading vector images in Microsoft's Windows 
Metafile Format (WMF)"
+HOMEPAGE="https://github.com/caolanm/libwmf http://wvware.sourceforge.net/";
+SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc expat X"
+
+RDEPEND="app-text/ghostscript-gpl
+   media-fonts/urw-fonts
+   media-libs/freetype:2=
+   media-libs/libpng:0=
+   sys-libs/zlib:=
+   x11-libs/gdk-pixbuf:2
+   virtual/jpeg:0=
+   expat? ( dev-libs/expat )
+   !expat? ( dev-libs/libxml2:2= )
+   X? ( x11-libs/libX11
+   x11-libs/libXt
+   x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" 
"TODO" )
+
+PATCHES=(
+"${FILESDIR}"/${PN}-0.2.8.4-build.patch
+"${FILESDIR}"/${PN}-0.2.8.4-libpng-1.5.patch
+"${FILESDIR}"/${PN}-0.2.8.4-pngfix.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   # Support for GD is disabled, since it's never linked, even, when 
enabled
+   # See https://bugs.gentoo.org/268161
+   local myeconfargs=(
+   --disable-gd
+   --disable-static
+   $(use_enable debug)
+   $(use_with expat)
+   $(use_with !expat libxml2)
+   $(use_with X x)
+   --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+   --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
+   --with-freetype
+   --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
+   
--with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
+   --with-jpeg
+   --with-layers
+   --with-png
+   --with-sys-gd
+   --with-zlib
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   # address parallel build issue, bug 677566
+   MAKEOPTS=-j1
+
+   default
+   find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+   gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+   gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+   gnome2_gdk_pixbuf_update
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2022-05-17 Thread WANG Xuerui
commit: b69f20608a951aec2c239c0e97bc6c257b5a2498
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue May 17 12:41:20 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue May 17 12:48:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b69f2060

media-libs/libwmf: keyword 0.2.8.4-r9 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
index 77cf073f7a5f..8f25fa6a80ab 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="http://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/project/wvware/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2022-01-18 Thread Sam James
commit: b463a6171a4ce2dc02b3c4c31f4306b6e3f5294a
Author: Paolo Pedroni  users  noreply  github  
com>
AuthorDate: Tue Nov 30 11:27:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 18 18:39:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b463a617

media-libs/libwmf: do not install .la files

Signed-off-by: Paolo Pedroni  iol.it>
Closes: https://bugs.gentoo.org/827894
Closes: https://github.com/gentoo/gentoo/pull/23124
Signed-off-by: Sam James  gentoo.org>

 media-libs/libwmf/{libwmf-0.2.8.4-r8.ebuild => libwmf-0.2.8.4-r9.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
similarity index 98%
rename from media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
rename to media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
index 55b213bf3b8a..77cf073f7a5f 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild
@@ -89,6 +89,7 @@ src_install() {
MAKEOPTS=-j1
 
default
+   find "${D}" -name '*.la' -delete || die
 }
 
 pkg_preinst() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2022-01-01 Thread James Le Cuirot
commit: 6a8d03d7f1f1cb7511ababd86c527ae41d2fd33e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  1 13:39:35 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  1 13:40:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8d03d7

media-libs/libwmf: Keyword 0.2.8.4-r8 for ~m68k

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index 53c0743ac37c..55b213bf3b8a 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="http://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/project/wvware/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2021-07-13 Thread Marek Szuba
commit: 9970889be9ee3b81143c6cfc79f01967110abdc8
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 13 15:26:30 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 13 19:36:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9970889b

media-libs/libwmf: keyword 0.2.8.4-r8 for ~riscv, EAPI 6 -> 7

Signed-off-by: Marek Szuba  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index 5015c38df7d..53c0743ac37 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools gnome2-utils
 
 DESCRIPTION="A library for reading vector images in Microsoft's Windows 
Metafile Format (WMF)"
 HOMEPAGE="http://wvware.sourceforge.net/";
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/wvware/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"
@@ -27,8 +27,8 @@ RDEPEND="app-text/ghostscript-gpl
x11-libs/libXt
x11-libs/libXpm )"
 
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" 
"TODO" )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2021-01-25 Thread Sam James
commit: 4b3b2e750844b794a1ba5a90655a1460063a5232
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 25 20:32:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 25 20:59:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3b2e75

media-libs/libwmf: HOMEPAGE does not support HTTPS

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index d281f1d619d..5015c38df7d 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools gnome2-utils
 
 DESCRIPTION="A library for reading vector images in Microsoft's Windows 
Metafile Format (WMF)"
-HOMEPAGE="https://wvware.sourceforge.net/";
+HOMEPAGE="http://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2021-01-06 Thread Fabian Groffen
commit: 8df4617b344492fa02cd06a8cb2e280debf327bc
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:22:10 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 14:26:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df4617b

media-libs/libwmf: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index c26a907b2c0..d281f1d619d 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2020-11-10 Thread Matt Turner
commit: 811d59e0f43714d3cea1eaaa0347307434015011
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Nov 10 17:42:57 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Nov 10 17:45:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811d59e0

media-libs/libwmf: Remove unnecessary [X?] from gdk-pixbuf dep

Signed-off-by: Matt Turner  gentoo.org>

 .../libwmf/{libwmf-0.2.8.4-r7.ebuild => libwmf-0.2.8.4-r8.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
similarity index 98%
rename from media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
rename to media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
index 63ddb5e7ef5..c26a907b2c0 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r8.ebuild
@@ -19,7 +19,7 @@ RDEPEND="app-text/ghostscript-gpl
media-libs/freetype:2=
media-libs/libpng:0=
sys-libs/zlib:=
-   x11-libs/gdk-pixbuf:2[X?]
+   x11-libs/gdk-pixbuf:2
virtual/jpeg:0=
expat? ( dev-libs/expat )
!expat? ( dev-libs/libxml2:2= )



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2020-02-08 Thread David Seifert
commit: 6a575302df370254751c008b7b3585f6b4aca837
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb  8 16:51:48 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  8 16:51:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a575302

media-libs/libwmf: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 3c130ff28f5..c4467c02169 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -69,11 +69,11 @@ src_configure() {
$(use_with expat)
$(use_with !expat libxml2)
$(use_with X x)
-   --with-docdir="${EPREFIX%/}"/usr/share/doc/${PF}
-   --with-fontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
+   --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+   --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
--with-freetype
-   --with-gsfontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
-   
--with-gsfontmap="${EPREFIX%/}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
+   --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
+   
--with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
--with-jpeg
--with-layers
--with-png



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-04-25 Thread Pacho Ramos
commit: 8a59f4db25997c9356fe03c8e5c1b9747910619c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Apr 25 16:21:19 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Apr 25 16:21:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a59f4db

media-libs/libwmf: Drop old

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 112 -
 1 file changed, 112 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
deleted file mode 100644
index 0418fee876c..000
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome2-utils
-
-#The configure script finds the 5.50 ghostscript Fontmap file while run.
-#This will probably work, especially since the real one (6.50) in this case
-#is empty. However beware in case there is any trouble
-
-DESCRIPTION="library for converting WMF files"
-HOMEPAGE="http://wvware.sourceforge.net/";
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
-IUSE="X debug doc expat xml"
-
-RDEPEND="
-   app-text/ghostscript-gpl
-   media-fonts/urw-fonts
-   media-libs/freetype:2=
-   >=media-libs/libpng-1.4:0=
-   sys-libs/zlib
-   x11-libs/gdk-pixbuf:2[X?]
-   virtual/jpeg:0=
-   xml? (
-   expat? ( dev-libs/expat )
-   !expat? (  dev-libs/libxml2 )
-   )
-   X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   X? (
-   x11-libs/libXt
-   x11-libs/libXpm
-   )"
-# plotutils are not really supported yet, so looks like that's it
-
-REQUIRED_USE="expat? ( xml )"
-
-DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
-
-PATCHES=(
-   "${FILESDIR}"/${P}-intoverflow.patch
-   "${FILESDIR}"/${P}-build.patch
-   "${FILESDIR}"/${P}-pngfix.patch
-   "${FILESDIR}"/${P}-libpng-1.5.patch
-   "${FILESDIR}"/${P}-use-system-fonts.patch
-   "${FILESDIR}"/${P}-gdk-pixbuf.patch
-   "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
-   "${FILESDIR}"/${P}-CVE-2015-4695.patch
-   "${FILESDIR}"/${P}-CVE-2015-4696.patch
-   )
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules'
-
-src_prepare() {
-   if ! use doc ; then
-   sed -e 's:doc::' -i Makefile.am || die
-   fi
-   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=()
-   # NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, 
that gd is built
-   # and included in libwmf. Since nothing in-tree seems to use 
media-libs/libwmf[gd],
-   # we're explicitly disabling gd use w.r.t. bug 268161
-   if use expat; then
-   myeconfargs+=( --without-libxml2 )
-   else
-   myeconfargs+=( $(use_with xml libxml2) )
-   fi
-
-   myeconfargs+=(
-   --disable-static
-   $(use_enable debug)
-   $(use_with X x)
-   $(use_with expat)
-   --disable-gd
-   --with-sys-gd
-   --with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
-   --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
-   --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-   )
-   autotools-utils_src_configure
-}
-
-src_install() {
-   MAKEOPTS+=" -j1"
-   autotools-utils_src_install
-}
-
-pkg_preinst() {
-   gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-   gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-   gnome2_gdk_pixbuf_update
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-04-24 Thread Thomas Deutschmann
commit: d7f8c86e97e5c74cfad67dde6e2eb1ac3cc4aad0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Apr 24 22:58:32 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr 24 22:58:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f8c86e

media-libs/libwmf: x86 stable (bug #676578)

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index a2ec3871043..be9a5235f94 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-04-14 Thread Aaron Bauman
commit: dea98f36e4b6b41f0afcad86654b5b63c3d4c426
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Apr 14 14:31:03 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Apr 14 14:31:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea98f36

media-libs/libwmf: arm64 stable (bug #641648)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 76de7e12caa..a2ec3871043 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-02-19 Thread Markus Meier
commit: b455bd88d764e6b2b2d43262c4058736f28dcd30
Author: Markus Meier  gentoo  org>
AuthorDate: Tue Feb 19 21:14:26 2019 +
Commit: Markus Meier  gentoo  org>
CommitDate: Tue Feb 19 21:14:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b455bd88

media-libs/libwmf: arm stable, bug #676578

Signed-off-by: Markus Meier  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 7026a0a2473..76de7e12caa 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-02-12 Thread Thomas Deutschmann
commit: cc45c3c2f6d62e64b172afbb9633dea6a0dd3364
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Feb 12 15:51:07 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Feb 12 15:51:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc45c3c2

media-libs/libwmf: address parallel make issue

Closes: https://bugs.gentoo.org/677566
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 49561c02208..7026a0a2473 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -84,6 +84,13 @@ src_configure() {
econf "${myeconfargs[@]}"
 }
 
+src_install() {
+   # address parallel build issue, bug 677566
+   MAKEOPTS=-j1
+
+   default
+}
+
 pkg_preinst() {
gnome2_gdk_pixbuf_savelist
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-02-07 Thread Mikle Kolyada
commit: 0b469e8c19a27900e7e67821abdb6ff90af429e8
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Feb  7 16:46:46 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Feb  7 16:46:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b469e8c

media-libs/libwmf: amd64 stable wrt bug #676578

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 36f06eab611..49561c02208 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-02-02 Thread Sergei Trofimovich
commit: ef06379271273584efb58d7e9af465fed820b3fb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Feb  2 21:14:15 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb  2 21:14:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef063792

media-libs/libwmf: stable 0.2.8.4-r7 for ppc64, bug #676578

Package-Manager: Portage-2.3.59, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 4cd849d0de9..36f06eab611 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-02-02 Thread Sergei Trofimovich
commit: 5ac2ff2b123a740fa00a0ee3fc038efccdb4619b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Feb  2 19:12:28 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb  2 19:12:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac2ff2b

media-libs/libwmf: stable 0.2.8.4-r7 for ia64, bug #676578

Package-Manager: Portage-2.3.59, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 4a11bddd1fb..61842af5df1 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-02-02 Thread Sergei Trofimovich
commit: 86ccf160ab475d0fcdcf7d4d6e63e1fd17c725b7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Feb  2 18:59:40 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb  2 18:59:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ccf160

media-libs/libwmf: stable 0.2.8.4-r7 for hppa, bug #676578

Package-Manager: Portage-2.3.59, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 49c0694c708..4a11bddd1fb 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-02-01 Thread Tobias Klausmann
commit: 0e8e27abb4ed8d7724bcaab58369781eb0abe52b
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Fri Feb  1 14:54:24 2019 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Fri Feb  1 14:54:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8e27ab

media-libs/libwmf-0.2.8.4-r7: alpha stable

Bug: http://bugs.gentoo.org/676578
Signed-off-by: Tobias Klausmann  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 5f3e1991a9b..49c0694c708 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2019-01-28 Thread Sergei Trofimovich
commit: cc3e6a6312e7a8a0bda4626139edb3116d4254c2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jan 28 19:07:46 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan 28 19:37:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3e6a63

media-libs/libwmf: stable 0.2.8.4-r7 for sparc, bug #676578

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 48585c30747..5f3e1991a9b 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's 
Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/";
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/, media-libs/libwmf/files/

2018-05-07 Thread Lars Wendler
commit: 9bcf16eb235ace63a47241be530166747ce5f3a3
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sun May  6 22:02:27 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  7 08:59:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcf16eb

media-libs/libwmf: Use pkg-config to find freetype

Closes: https://bugs.gentoo.org/649462
Closes: https://bugs.gentoo.org/654984
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8292

 .../libwmf-0.2.8.4-use-freetype2-pkg-config.patch  | 67 +++
 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild | 97 ++
 media-libs/libwmf/metadata.xml |  9 +-
 3 files changed, 169 insertions(+), 4 deletions(-)

diff --git 
a/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch 
b/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch
new file mode 100644
index 000..0f133e2e75e
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch
@@ -0,0 +1,67 @@
+From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001
+From: Koen Kooi 
+Date: Wed, 6 Aug 2014 14:53:03 +0200
+Subject: [PATCH] configure: use pkg-config for freetype
+
+Upstream-status: Pending
+Signed-off-by: Koen Kooi 
+---
+ configure.ac | 37 -
+ 1 file changed, 8 insertions(+), 29 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3cfe974..0055a8c 100644
+--- a/configure.ac
 b/configure.ac
+@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[  --with-freetype=DIR use 
freetype2 in DIR],[
+   fi
+ ])
+ 
+-if [ test -n "$FREETYPE_DIR" ]; then
+-  AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, 
,[$FREETYPE_DIR/bin:$PATH])
+-else
+-  AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
+-fi
+-
+-if [ test -n "$FREETYPE_CONFIG" ]; then
+-  if [ test -n "$FREETYPE_DIR" ]; then
+-  freetype_cflags="`$FREETYPE_CONFIG --cflags` 
-I$FREETYPE_DIR/include"
+-  freetype_libs=`$FREETYPE_CONFIG --libs`
+-  else
+-  freetype_cflags=`$FREETYPE_CONFIG --cflags`
+-  freetype_libs=`$FREETYPE_CONFIG --libs`
+-  fi
+-else
+-  if [ test -n "$FREETYPE_DIR" ]; then
+-  freetype_cflags="-I$FREETYPE_DIR/include/freetype2 
-I$FREETYPE_DIR/include"
+-  freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
+-  else
+-  freetype_cflags=""
+-  freetype_libs="-lfreetype"
+-  fi
+-fi
+-
+-CPPFLAGS="$freetype_cflags $CPPFLAGS"
+-LDFLAGS="$LDFLAGS $freetype_libs"
++PKG_CHECK_MODULES(FREETYPE2, freetype2, 
++CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
++AC_MSG_ERROR([*** Unable to find FreeType2 library 
(http://www.freetype.org/)])
++)
+ 
+ AC_CHECK_LIB(freetype,FT_Init_FreeType,[
+-  WMF_FT_LDFLAGS="$freetype_libs"
++  WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
+ ],[   AC_MSG_ERROR([* * * freetype(2) is required * * *])
+ ])
+ AC_CHECK_HEADER(ft2build.h,[
+-  WMF_FT_CFLAGS="$freetype_cflags"
+-  WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
++  WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
++  WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
+ ],[   AC_MSG_ERROR([* * * freetype(2) is required * * *])
+ ])
+ 
+-- 
+1.9.0
+

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
new file mode 100644
index 000..48585c30747
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A library for reading vector images in Microsoft's Windows 
Metafile Format (WMF)"
+HOMEPAGE="https://wvware.sourceforge.net/";
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc expat X"
+
+RDEPEND="app-text/ghostscript-gpl
+   media-fonts/urw-fonts
+   media-libs/freetype:2=
+   media-libs/libpng:0=
+   sys-libs/zlib:=
+   x11-libs/gdk-pixbuf:2[X?]
+   virtual/jpeg:0=
+   expat? ( dev-libs/expat )
+   !expat? ( dev-libs/libxml2:2= )
+   X? ( x11-libs/libX11
+   x11-libs/libXt
+   x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" 
"TODO" )
+
+PATCHES=(
+   "${FILESDIR}"/${P}-build.patch
+   "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
+   "${FILESDIR}"/${P}-CVE-2015-4695.patch
+   "${FILESDIR}"/${P}-CVE-2015-4696.patch
+   "${FILESDIR}"/${P}-gdk-pixbuf.patch
+   "${FILESDIR}"/${P}-intoverflow.patch
+   "${FILE

[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2017-06-18 Thread Alexis Ballier
commit: 7a514720e8a59e38fa760f03915d5e0147763c1d
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jun 17 23:24:20 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun 18 09:51:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a514720

media-libs/libwmf: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index fb2a53576a6..0418fee876c 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2016-01-10 Thread Michael Palimaka
commit: ec60192d6f3acb009ae8263047236e89aed3ef03
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jan 10 14:20:03 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jan 10 14:20:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec60192d

media-libs/libwmf: remove old

Package-Manager: portage-2.2.26

 media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild | 110 -
 1 file changed, 110 deletions(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild
deleted file mode 100644
index 3b4e294..000
--- a/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome2-utils
-
-#The configure script finds the 5.50 ghostscript Fontmap file while run.
-#This will probably work, especially since the real one (6.50) in this case
-#is empty. However beware in case there is any trouble
-
-DESCRIPTION="library for converting WMF files"
-HOMEPAGE="http://wvware.sourceforge.net/";
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
-IUSE="X debug doc expat xml"
-
-RDEPEND="
-   app-text/ghostscript-gpl
-   media-fonts/urw-fonts
-   >=media-libs/freetype-2.0.1
-   >=media-libs/libpng-1.4
-   sys-libs/zlib
-   x11-libs/gdk-pixbuf:2[X?]
-   virtual/jpeg
-   xml? (
-   expat? ( dev-libs/expat )
-   !expat? (  dev-libs/libxml2 )
-   )
-   X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   X? (
-   x11-libs/libXt
-   x11-libs/libXpm
-   )"
-# plotutils are not really supported yet, so looks like that's it
-
-REQUIRED_USE="expat? ( xml )"
-
-DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
-
-PATCHES=(
-   "${FILESDIR}"/${P}-intoverflow.patch
-   "${FILESDIR}"/${P}-build.patch
-   "${FILESDIR}"/${P}-pngfix.patch
-   "${FILESDIR}"/${P}-libpng-1.5.patch
-   "${FILESDIR}"/${P}-use-system-fonts.patch
-   "${FILESDIR}"/${P}-gdk-pixbuf.patch
-   )
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules'
-
-src_prepare() {
-   if ! use doc ; then
-   sed -e 's:doc::' -i Makefile.am || die
-   fi
-   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=()
-   # NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, 
that gd is built
-   # and included in libwmf. Since nothing in-tree seems to use 
media-libs/libwmf[gd],
-   # we're explicitly disabling gd use w.r.t. bug 268161
-   if use expat; then
-   myeconfargs+=( --without-libxml2 )
-   else
-   myeconfargs+=( $(use_with xml libxml2) )
-   fi
-
-   myeconfargs+=(
-   --disable-static
-   $(use_enable debug)
-   $(use_with X x)
-   $(use_with expat)
-   --disable-gd
-   --with-sys-gd
-   --with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
-   --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
-   --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-   )
-   autotools-utils_src_configure
-}
-
-src_install() {
-   MAKEOPTS+=" -j1"
-   autotools-utils_src_install
-}
-
-pkg_preinst() {
-   gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-   gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-   gnome2_gdk_pixbuf_update
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2015-12-27 Thread Mikle Kolyada
commit: 2b7c6ede33815124ec180c05bac695d3823aec42
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Dec 27 10:38:30 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Dec 27 10:39:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b7c6ede

media-libs/libwmf: sparc stable wrt bug #551144

Package-Manager: portage-2.2.24

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index 3acc5bf..a6cf2a0 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2015-11-18 Thread Agostino Sarubbo
commit: c9a10a59a2797f9aeabd23afba0ec552bf9ac721
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 18 09:30:58 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 18 09:30:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a10a59

media-libs/libwmf: ia64 stable wrt bug #551144

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ia64"

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index 4a95fac..3acc5bf 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2015-11-14 Thread Markus Meier
commit: 70aafe8d436b6d876eeaaafcee499449d3077ffd
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Nov 14 16:44:52 2015 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Nov 14 16:44:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70aafe8d

media-libs/libwmf: arm stable, bug #551144

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="arm"

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index 3eb34ef..4a95fac 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2015-11-09 Thread Agostino Sarubbo
commit: 0b9d198c8a1f9b188b61bd6933203f30a1535891
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Nov  9 08:53:17 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Nov  9 08:53:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9d198c

media-libs/libwmf: ppc stable wrt bug #551144

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index a035533..3eb34ef 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2015-11-06 Thread Agostino Sarubbo
commit: f53f6ec3d0eab80dc87f5a1415aca65932a72442
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov  6 11:27:49 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov  6 11:27:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53f6ec3

media-libs/libwmf: x86 stable wrt bug #551144

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index a394fc0..a035533 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2015-11-06 Thread Agostino Sarubbo
commit: 20dcb4ab04af85701f6ba2d10471094389d7442e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov  6 11:27:10 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov  6 11:27:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20dcb4ab

media-libs/libwmf: amd64 stable wrt bug #551144

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index 5acdc3c..a394fc0 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/

2015-11-05 Thread Jeroen Roovers
commit: 2b06f245273711d1d68d6a2fb15972c07aafc163
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Nov  6 04:36:49 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Nov  6 04:36:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b06f245

media-libs/libwmf: Stable for HPPA PPC64 (bug #551144).

Package-Manager: portage-2.2.24
RepoMan-Options: --ignore-arches

 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild 
b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index b304973..5acdc3c 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris"
 IUSE="X debug doc expat xml"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-libs/libwmf/, media-libs/libwmf/files/

2015-10-28 Thread Michał Górny
commit: eca676636078bad3c537dae10681c74d5cddcba7
Author: Alexander Tsoy  tsoy  me>
AuthorDate: Wed Oct 28 01:05:23 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Oct 28 02:12:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca67663

media-libs/libwmf: revbump with security fixes

Fixed security issues:

CVE-2015-0848: heap overflow when decoding BMP images
CVE-2015-4695: heap buffer overread in meta.h
CVE-2015-4696: use-after-free flaw in meta.h
CVE-2015-4588: heap overflow within the RLE decoding of embedded
   BMP images

Gentoo-Bug: 553818

 ...ibwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch | 118 +
 .../files/libwmf-0.2.8.4-CVE-2015-4695.patch   |  56 ++
 .../files/libwmf-0.2.8.4-CVE-2015-4696.patch   |  23 
 media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild | 113 
 4 files changed, 310 insertions(+)

diff --git 
a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch 
b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
new file mode 100644
index 000..e8ba8db
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
@@ -0,0 +1,118 @@
+--- libwmf-0.2.8.4/src/ipa/ipa/bmp.h   2015-06-08 14:46:24.591876404 +0100
 libwmf-0.2.8.4/src/ipa/ipa/bmp.h   2015-06-08 14:46:35.345993247 +0100
+@@ -859,7 +859,7 @@
+ %
+ %
+ */
+-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int 
compression,unsigned char* pixels)
++static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int 
compression,unsigned char* pixels)
+ { int byte;
+   int count;
+   int i;
+@@ -870,12 +870,14 @@
+   U32 u;
+ 
+   unsigned char* q;
++  unsigned char* end;
+ 
+   for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] 
= 0;
+ 
+   byte = 0;
+   x = 0;
+   q = pixels;
++  end = pixels + bmp->width * bmp->height;
+ 
+   for (y = 0; y < bmp->height; )
+   {   count = ReadBlobByte (src);
+@@ -884,7 +886,10 @@
+   {   /* Encoded mode. */
+   byte = ReadBlobByte (src);
+   for (i = 0; i < count; i++)
+-  {   if (compression == 1)
++  {   
++  if (q == end)
++  return 0;
++  if (compression == 1)
+   {   (*(q++)) = (unsigned char) byte;
+   }
+   else
+@@ -896,13 +901,15 @@
+   else
+   {   /* Escape mode. */
+   count = ReadBlobByte (src);
+-  if (count == 0x01) return;
++  if (count == 0x01) return 1;
+   switch (count)
+   {
+   case 0x00:
+{  /* End of line. */
+   x = 0;
+   y++;
++  if (y >= bmp->height)
++  return 0;
+   q = pixels + y * bmp->width;
+   break;
+}
+@@ -910,13 +917,20 @@
+{  /* Delta mode. */
+   x += ReadBlobByte (src);
+   y += ReadBlobByte (src);
++  if (y >= bmp->height)
++  return 0;
++  if (x >= bmp->width)
++  return 0;
+   q = pixels + y * bmp->width + x;
+   break;
+}
+   default:
+{  /* Absolute mode. */
+   for (i = 0; i < count; i++)
+-  {   if (compression == 1)
++  {
++  if (q == end)
++  return 0;
++  if (compression == 1)
+   {   (*(q++)) = ReadBlobByte (src);
+   }
+   else
+@@ -943,7 +957,7 @@
+   byte = ReadBlobByte (src);  /* end of line */
+   byte = ReadBlobByte (src);
+ 
+-  return;
++  return 1;
+ }
+ 
+ /*
+@@ -1143,8 +1157,18 @@
+   }
+   }
+   else
+-  {   /* Convert run-length encoded raster pixels. */
+-  DecodeImage (API,bmp,src,(unsigned int) 
bmp_info.compression,data->image);
++  {
++  if (bmp_info.bits_per_pixel == 8)   /* Convert run-length 
encoded raster pixels. */
++  {
++