[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2024-01-08 Thread Sam James 
commit: d7449bbbc7e898bc848a447ce14ef9e32199453b
Author: Nicholas Vinson  gmail  com>
AuthorDate: Tue Jan  9 04:42:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  9 07:29:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7449bbb

media-gfx/sam2p: Fix clang -flto build failure

When compiling with clang and ld.lld build fails with the error message:

ps_tiny.o: file not recognized: file format not recognized

This is because the build system does not properly honor standard
buildtime flags and instead requires nonstandard flags be set to get the
proper build result. This patch sets the necessary flags to successfully
compile with clang and -flto.

Signed-off-by: Nicholas Vinson  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34717
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 2ce3a6e8e027..fd8877e311de 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.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
@@ -48,7 +48,12 @@ src_configure() {
 }
 
 src_compile() {
-   emake GCC_STRIP=
+   emake GCC_STRIP= \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   LD="$(tc-getCC)" \
+   LDXX="$(tc-getCXX)" \
+   LDY="$(tc-getCC)"
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/, media-gfx/sam2p/

2021-12-01 Thread Sam James 
commit: 23139790af0807c7a92d0861e4601f02dd2ee808
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  1 15:59:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  1 16:25:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23139790

media-gfx/sam2p: fix configure with clang

Closes: https://bugs.gentoo.org/827925
Thanks-to:  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../sam2p-0.49.4_p20190718-fix-configure-clang.patch  | 15 +++
 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild  |  7 +--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git 
a/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch 
b/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch
new file mode 100644
index ..0d8e769e903d
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/827925
+--- a/configure.in
 b/configure.in
+@@ -79,11 +79,11 @@ else
+ fi
+
+ dnl Checks for programs.
+ dnl AC_PROG_CC
+ AC_LANG_CPLUSPLUS
+-CXXFLAGS=" "
++CXXFLAGS="-fPIC"
+ dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
+ CCC="$CCC g++"
+ dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
+ AC_PROG_CXX

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 43f217aba10d..3adddb11fdbc 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -21,7 +21,10 @@ BDEPEND="dev-lang/perl"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-build-fixes.patch
+   "${FILESDIR}"/${PN}-0.49.4_p20190718-fix-configure-clang.patch
+)
 
 src_prepare() {
default
@@ -30,7 +33,7 @@ src_prepare() {
mv configure.{in,ac} || die
 
# missing include for memset
-   sed -i '1s;^;#include \n;' pts_defl.c
+   sed -i '1s;^;#include \n;' pts_defl.c || die
 
# eautoreconf is still needed or you get bad warnings
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2021-08-05 Thread Yixun Lan 
commit: a04cc0ec9b3e15a36d6103fea5aeaf8a4c189222
Author: Alex Fan  yahoo  com>
AuthorDate: Thu Aug  5 01:43:53 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Aug  5 13:52:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04cc0ec

media-gfx/sam2p: keyword 0.49.4_p20190718-r1 for ~riscv

Signed-off-by: Alex Fan  yahoo.com>
Signed-off-by: Yixun Lan  gentoo.org>

 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 35793f715a1..43f217aba10 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.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=7
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/

2020-11-10 Thread Sam James 
commit: 6eb198608ec3087deffd074ab6a8be044165051a
Author: John Helmert III  posteo  net>
AuthorDate: Fri Oct 16 01:12:57 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 11 00:25:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb19860

media-gfx/sam2p: drop 0.49.3 (security)

Bug: https://bugs.gentoo.org/636876
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/17945
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sam2p/Manifest   |   1 -
 .../sam2p/files/sam2p-0.49.3-build-fixes.patch | 160 -
 media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch   |  23 ---
 media-gfx/sam2p/sam2p-0.49.3.ebuild|  47 --
 4 files changed, 231 deletions(-)

diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index d8df300a1fd..53c2024bccf 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,2 +1 @@
-DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 
47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674
 SHA512 
9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 
3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6
 SHA512 
1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51

diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch 
b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
deleted file mode 100644
index dfad65cc05d..000
--- a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Fix literal suffix errors in C++14, caused by missing spaces between
-C-strings and macros.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=585630
-
 a/configure.in
-+++ b/configure.in
-@@ -81,8 +81,6 @@
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
--dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
- CCC="$CCC g++"
- dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
- AC_PROG_CXX
-@@ -216,7 +214,7 @@
- 
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot 
compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
- 
 a/gensio.cpp
-+++ b/gensio.cpp
-@@ -494,7 +494,7 @@
- 
-  #if HAVE_PTS_POPEN
-   if (!tmpsname) {
--if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-+if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
- signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if 
child cannot read our data */
-   } else {
-  #else
-@@ -622,7 +622,7 @@
-   if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' 
*/
-#if HAVE_PTS_POPEN
- if (!tmpsname) {
--  if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-+  if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-   signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals 
if child cannot read our data */
-   vi_precopy();
-   in.vi_read(0,0);
-@@ -730,12 +730,7 @@
- 
- /* --- */
- 
--
--#if HAVE_lstat_in_sys_stat
--#  define PTS_lstat lstat
--#else
- #  define PTS_lstat stat
--#endif
- 
- /** @param fname must start with '/' (dir separator)
-  * @return true if file successfully created
 a/in_ps.cpp
-+++ b/in_ps.cpp
-@@ -137,7 +137,7 @@
- // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g 
%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury);
- /* Dat: we must call translate _after_ setpagedevice (so it will take 
effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 
12 22:49:07 CEST 2005 */
- sprintf(bboxline,
--  "<>setpagedevice\n"
-+  "<>setpagedevice\n"
-   /* removing /PageSize also cancels /a4, /a5 etc. */
-   /* we need `currentmatrix ... setpagedevice setmatrix' because
-* setpagedevice cancels the current transformation matrix so our
-@@ -147,7

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2020-10-15 Thread Sergei Trofimovich 
commit: ee984ef26dcb614a220dfd8439773bd7cc8164a1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 15 21:56:07 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 15 22:21:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee984ef2

media-gfx/sam2p: stable 0.49.4_p20190718-r1 for hppa

stable wrt bug #636876

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

 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 35793f715a1..7672df96d2c 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2020-10-13 Thread Agostino Sarubbo 
commit: f8889a707cb9584f0015ddb5a693e537fe2303f6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 13 09:59:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 13 10:01:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8889a70

media-gfx/sam2p: x86 stable wrt bug #636876

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index d3d7b780a83..35793f715a1 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 
~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2020-10-11 Thread Sam James 
commit: 1400fd739cb3529b4ab900ea970d931fd673f970
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 11 23:37:38 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 11 23:39:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1400fd73

media-gfx/sam2p: Stabilize 0.49.4_p20190718-r1 sparc, #636876

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

 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index df3f2211e77..87c54a14bfc 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2020-10-11 Thread Sam James 
commit: 061cee9e502ca1ef244d967fd40ba77e7cc2a31b
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 11 17:47:07 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 11 17:47:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061cee9e

media-gfx/sam2p: Stabilize 0.49.4_p20190718-r1 arm, #636876

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

 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index e95883c8eca..df3f2211e77 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/

2020-10-09 Thread Sam James 
commit: fed7eb00df36cec72f22422b72973fe1723d5d86
Author: John Helmert III  posteo  net>
AuthorDate: Sat Oct 10 03:15:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 10 04:58:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed7eb00

media-gfx/sam2p: correct compiler configuration

Closes: https://bugs.gentoo.org/746638
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/17869
Signed-off-by: Sam James  gentoo.org>

 media-gfx/sam2p/files/sam2p-build-fixes.patch  | 53 ++
 media-gfx/sam2p/files/sam2p-configure-strip.patch  | 30 
 ...718.ebuild => sam2p-0.49.4_p20190718-r1.ebuild} |  8 ++--
 3 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-build-fixes.patch 
b/media-gfx/sam2p/files/sam2p-build-fixes.patch
new file mode 100644
index 000..6a1c8017512
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-build-fixes.patch
@@ -0,0 +1,53 @@
+Make stripping configurable, correct CC/CXX/CFLAGS/CXXFLAGS handling, add
+missing include
+
+diff --git a/Makefile b/Makefile
+index 1433167..38bb7cc 100644
+--- a/Makefile
 b/Makefile
+@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
+ MAKE_DIST=000
+ endif
+
++GCC_STRIP ?= -s
+ BASH=bash
+ PERL_BADLANG=x
+ export PERL_BADLANG
+
+ CXXX=$(CXD_assert)
+-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG), no)
+ CXXX=$(CXD_no)
+ endif
+@@ -46,8 +47,8 @@ CXXX=$(CXD_checker)
+ LDALL=checkerg++ $(LDFLAGS) $(LIBS)
+ endif
+
+-CXXALL=$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
+-CCALL =$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
++CXXALL=$(CXX) $(CXXFLAGS) $(CXXFLAGSB)
++CCALL =$(CC) $(CFLAGS) $(CXXFLAGSB)
+ CXDFAL=$(CXXFLAGS) $(CXXFLAGSB) $(LDFLAGS) $(LIBS)
+
+ .PHONY: clean dist dist-noautoconf dist-more allclean distclean dist-install
+@@ -67,7 +68,7 @@ ifeq ($(MAKE_DIST),)
+   #
+   # echo to config.h is needed to make config.h younger than config.h.in;
+   # configure doesn't change the timestamp of config.h if it's unchanged.
+-  Makedep config.h: configure Makehelp.in config.h.in ccdep.pl 
sam2p_version.h; ./configure MAKE=$(MAKE) --enable-gif --enable-lzw && echo "" 
>>config.h
++  Makedep config.h: configure Makehelp.in config.h.in ccdep.pl 
sam2p_version.h;
+   Makehelp:;
+   include Makehelp  # Defines CXX. File generated by ./configure.
+   include Makedep   # Contains ALL+=... .
+@@ -101,8 +102,8 @@ IDE_MODES := release debug
+ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
+ IDE_TARGETS_release := $(TARGETS)
+
+-CXD_assert =$(CXX) -s -O2
+-CXD_no =$(CXX) -s -DNDEBUG -O3
++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
++CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
+ # CXD_yes=$(CXX) $(GFLAG) -lefence
+ CXD_yes=$(CXX) $(GFLAG)
+ CXD_checker=checkerg++ $(GFLAG)

diff --git a/media-gfx/sam2p/files/sam2p-configure-strip.patch 
b/media-gfx/sam2p/files/sam2p-configure-strip.patch
deleted file mode 100644
index be78fad0f73..000
--- a/media-gfx/sam2p/files/sam2p-configure-strip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1433167..b662e33 100644
 a/Makefile
-+++ b/Makefile
-@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
- MAKE_DIST=000
- endif
- 
-+GCC_STRIP ?= -s
- BASH=bash
- PERL_BADLANG=x
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -101,8 +102,8 @@ IDE_MODES := release debug
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
-+CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
- # CXD_yes=$(CXX) $(GFLAG) -lefence
- CXD_yes=$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
similarity index 84%
rename from media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
rename to media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 2460983318f..e95883c8eca 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -21,7 +21,7 @@ BDEPEND="dev-lang/perl"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=( "${FILESDIR}"/${PN}-configure-strip.patch )
+PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
 
 src_prepare() {
default
@@ -29,15 +29,15 @@ src_prepare() {
# configure.in files are deprecated
mv configure.{in,ac} || die
 
-   # upstream thinks they're being helpful by running configure with `make`
-   sed -i '/Makedep/s/ .\/configure.*//' Makefile || die
+   # missing include for memset
+   sed -i '1s;^;#include \n;' pts_defl.c
 
# eautoreconf is

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/

2020-10-04 Thread David Seifert 
commit: 173810552f074b83f9d0bdee1e50e5691904b9d9
Author: John Helmert III  posteo  net>
AuthorDate: Sun Oct  4 17:09:13 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct  4 17:09:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17381055

media-gfx/sam2p: Security bump

Bug: https://bugs.gentoo.org/631636
Bug: https://bugs.gentoo.org/636876
Bug: https://bugs.gentoo.org/649750
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16286
Signed-off-by: David Seifert  gentoo.org>

 media-gfx/sam2p/Manifest  |  1 +
 media-gfx/sam2p/files/sam2p-configure-strip.patch | 30 +++
 media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild | 62 +++
 3 files changed, 93 insertions(+)

diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index b141a11da73..d8df300a1fd 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1 +1,2 @@
 DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 
47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674
 SHA512 
9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
+DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 
3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6
 SHA512 
1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51

diff --git a/media-gfx/sam2p/files/sam2p-configure-strip.patch 
b/media-gfx/sam2p/files/sam2p-configure-strip.patch
new file mode 100644
index 000..be78fad0f73
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-configure-strip.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index 1433167..b662e33 100644
+--- a/Makefile
 b/Makefile
+@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
+ MAKE_DIST=000
+ endif
+ 
++GCC_STRIP ?= -s
+ BASH=bash
+ PERL_BADLANG=x
+ export PERL_BADLANG
+ 
+ CXXX=$(CXD_assert)
+-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG), no)
+ CXXX=$(CXD_no)
+ endif
+@@ -101,8 +102,8 @@ IDE_MODES := release debug
+ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
+ IDE_TARGETS_release := $(TARGETS)
+ 
+-CXD_assert =$(CXX) -s -O2
+-CXD_no =$(CXX) -s -DNDEBUG -O3
++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
++CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
+ # CXD_yes=$(CXX) $(GFLAG) -lefence
+ CXD_yes=$(CXX) $(GFLAG)
+ CXD_checker=checkerg++ $(GFLAG)

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild 
b/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
new file mode 100644
index 000..2460983318f
--- /dev/null
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+COMMIT="b953f63307c4a83fa4615a4863e3fb250205cd98"
+
+DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
+HOMEPAGE="https://github.com/pts/sam2p;
+SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-macos"
+IUSE="examples gif"
+RESTRICT="test"
+
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${PN}-configure-strip.patch )
+
+src_prepare() {
+   default
+
+   # configure.in files are deprecated
+   mv configure.{in,ac} || die
+
+   # upstream thinks they're being helpful by running configure with `make`
+   sed -i '/Makedep/s/ .\/configure.*//' Makefile || die
+
+   # eautoreconf is still needed or you get bad warnings
+   eautoreconf
+}
+
+src_configure() {
+   tc-export CXX
+
+   econf \
+   --enable-lzw \
+   $(use_enable gif)
+}
+
+src_compile() {
+   emake GCC_STRIP=
+}
+
+src_install() {
+   dobin sam2p
+   einstalldocs
+
+   if use examples; then
+   # clear pre-compressed files
+   rm examples/*.gz || die
+
+   dodoc -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/

2019-11-18 Thread Aaron Bauman 
commit: 312c0ab25c0dad63411a4e2a6ca43d9477bc773a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Nov 14 15:14:36 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Nov 18 22:16:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312c0ab2

media-gfx/sam2p: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13651
Signed-off-by: Aaron Bauman  gentoo.org>

 media-gfx/sam2p/files/sam2p-0.45-fbsd.patch   | 14 
 media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch | 18 --
 media-gfx/sam2p/files/sam2p-0.49.1-build.patch| 42 ---
 media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch| 39 -
 4 files changed, 113 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch 
b/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
deleted file mode 100644
index aed13acf08d..000
--- a/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 gensio.cpp.origFri Feb  7 02:24:56 2003
-+++ gensio.cpp Fri Feb  7 02:25:11 2003
-@@ -491,11 +491,7 @@
- /* --- */
- 
- 
--#if HAVE_lstat_in_sys_stat
--#  define PTS_lstat lstat
--#else
- #  define PTS_lstat stat
--#endif
- 
- /** @param fname must start with '/' (dir separator)
-  * @return true if file successfully created

diff --git a/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch 
b/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
deleted file mode 100644
index f96a9796939..000
--- a/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/524048
-
-ignore warnings w/newer glibc-2.20
-
-patch by Dmitry Derevyanko
-
 a/ccdep.pl
-+++ b/ccdep.pl
-@@ -233,6 +233,9 @@
-   } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: this is the location of /) {
- # ^^^ gcc-3.1
- undef $included_from;
-+  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: .*\bdeprecated\b/) {
-+# Example: /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE 
and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-+undef $included_from;
-   } elsif ($S=~/: No such file or directory$/) {  # Depends on $ENV{LC_ALL}.
- # ^^^ gcc-3.3
- undef $included_from;

diff --git a/media-gfx/sam2p/files/sam2p-0.49.1-build.patch 
b/media-gfx/sam2p/files/sam2p-0.49.1-build.patch
deleted file mode 100644
index ba421463d53..000
--- a/media-gfx/sam2p/files/sam2p-0.49.1-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
 configure.in
-+++ configure.in
-@@ -81,7 +81,7 @@
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
-+#CXXFLAGS=" "
- dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
- CCC="$CCC g++"
- dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
-@@ -215,7 +215,7 @@
- 
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot 
compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
- 
 Makefile
-+++ Makefile
-@@ -17,7 +17,7 @@
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -51,8 +51,8 @@
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX)
-+CXD_no =$(CXX) -DNDEBUG
- # CXD_yes=$(CXX) $(GFLAG) -lefence
- CXD_yes=$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)

diff --git a/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch 
b/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch
deleted file mode 100644
index d427c2076d3..000
--- a/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: ccdep.pl
-===
 ccdep.pl   (revision 123)
-+++ ccdep.pl   (revision 125)
-@@ -137,13 +137,20 @@
- 
- my @DS=find_ds();
- my @DSQ=map{shq$_}@DS;
--my $R="$GCCP -DOBJDEP -M -MG -E 2>&1 @DSQ";
--$R=backtick($R);
-+my $DIAG=" -fno-diagnostics-show-caret";
-+my $Q="$GCCP -DOBJDEP$DIAG -M -MG -E 2>&1 @DSQ";
-+my $R=backtick($Q);
-+if ($R=~/\berror: .*-fno-diagnostics-show-caret\b/) {
-+  # gcc-4.6 and earlier don't have this flag, and they fail.
-+  $Q=~s@ -fno-diagnostics-show-caret(?=\s)@@;
-+  $DIAG="";
-+  $R=backtick($Q);
-+}
- 
- if ($R!~/: warning: #warning\b/) {
-   # config2.h:314:4: warning: #warning REQUIRES: c_lgcc3.o
-   # Dat: g++-3.3 ignores #warning with -M -MG -E
--  $R.="\n".backtick("$GCCP -DOBJDEP -E 2>&1 >/dev/null @DSQ");
-+  $R.="\n".backtick("$GCCP -DOBJDEP$DIAG -E 2>&1 >/dev/null @DSQ");
- }
- 
- ## die $R;
 rule.hpp   2013-04-18 12:14:20.385333527 +0200
-+++

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2019-11-10 Thread Aaron Bauman 
commit: a8b6dee02fef255ca173d81da79260bc660eed3f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Nov 10 01:58:07 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Nov 10 01:58:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b6dee0

media-gfx/sam2p: drop old EAPI

Signed-off-by: Aaron Bauman  gentoo.org>

 media-gfx/sam2p/Manifest|  2 --
 media-gfx/sam2p/sam2p-0.49.1.ebuild | 43 -
 media-gfx/sam2p/sam2p-0.49.2.ebuild | 42 
 3 files changed, 87 deletions(-)

diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 7f9a9680fca..b141a11da73 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,3 +1 @@
-DIST sam2p-0.49.1.tar.gz 562304 BLAKE2B 
57d14c9cc4f68e118a96a17420a341351b301144eee7786b41443d0f6e0eba93cd31ed10491fe04371a6c51d70eee9ce55d53df2fa10c05ef6445aac9286
 SHA512 
58565fdcb7c450ad23c2971b70f0362dbf4ecfd8c4dedf19c25b56fc98c8799696c6ecf75d47650bc3b21f88b8454d7c4e6b206f7c0ae0e5de35d608262c1220
-DIST sam2p-0.49.2.tar.gz 562733 BLAKE2B 
607264776db1d735ba09d2cebe0b569a2d2f837de9647eca1b495057b366d91d3ed0df6e219beecee7bc0da2805c659e73055ddc5842970914728ababdd14e40
 SHA512 
8e4d629df192381bddf8468687c6a41d459b70788a5e9defc68d5497f855cbae838f2f6f924237b17e4a8e6fbf982fb2709615c8fb1d9c8cec5ec7ecf91ec6ce
 DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 
47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674
 SHA512 
9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8

diff --git a/media-gfx/sam2p/sam2p-0.49.1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.1.ebuild
deleted file mode 100644
index 033f7e06288..000
--- a/media-gfx/sam2p/sam2p-0.49.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
-HOMEPAGE="https://github.com/pts/sam2p;
-SRC_URI="https://sam2p.googlecode.com/files/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="examples gif"
-
-RDEPEND=""
-DEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${PN}-0.45-fbsd.patch \
-   "${FILESDIR}"/${PN}-0.49.1-build.patch \
-   "${FILESDIR}"/${PN}-0.49.1-gcc48.patch \
-   "${FILESDIR}"/${PN}-0.49-glibc-2.20.patch
-   eautoreconf
-   tc-export CXX
-}
-
-src_configure() {
-   econf --enable-lzw $(use_enable gif)
-}
-
-src_install() {
-   dobin sam2p
-   dodoc README
-
-   if use examples; then
-   insinto /usr/share/doc/${PF}/examples
-   doins examples/*
-   fi
-}

diff --git a/media-gfx/sam2p/sam2p-0.49.2.ebuild 
b/media-gfx/sam2p/sam2p-0.49.2.ebuild
deleted file mode 100644
index b8d4582c1bd..000
--- a/media-gfx/sam2p/sam2p-0.49.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
-HOMEPAGE="https://github.com/pts/sam2p;
-SRC_URI="https://github.com/pts/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86"
-IUSE="examples gif"
-
-RDEPEND=""
-DEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${PN}-0.45-fbsd.patch \
-   "${FILESDIR}"/${PN}-0.49.1-build.patch \
-   "${FILESDIR}"/${PN}-0.49-glibc-2.20.patch
-   eautoreconf
-   tc-export CXX
-}
-
-src_configure() {
-   econf --enable-lzw $(use_enable gif)
-}
-
-src_install() {
-   dobin sam2p
-   dodoc README
-
-   if use examples; then
-   insinto /usr/share/doc/${PF}/examples
-   doins examples/*
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-12-31 Thread Jonas Stein 
commit: 98fff3f12fbea42bb798bc53de46ba51e6b29181
Author: Jonas Stein  gentoo  org>
AuthorDate: Mon Jan  1 00:46:31 2018 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Mon Jan  1 00:46:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fff3f1

media-gfx/sam2p: Update SRC_URI and HOMEPAGE

Project moved from code.google to github.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/sam2p/sam2p-0.49.1.ebuild | 4 ++--
 media-gfx/sam2p/sam2p-0.49.2.ebuild | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.1.ebuild 
b/media-gfx/sam2p/sam2p-0.49.1.ebuild
index 3ec3ab048c3..37e7d4e26df 100644
--- a/media-gfx/sam2p/sam2p-0.49.1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
-HOMEPAGE="https://code.google.com/p/sam2p/;
+HOMEPAGE="https://github.com/pts/sam2p;
 SRC_URI="https://sam2p.googlecode.com/files/${P}.tar.gz;
 
 LICENSE="GPL-2"

diff --git a/media-gfx/sam2p/sam2p-0.49.2.ebuild 
b/media-gfx/sam2p/sam2p-0.49.2.ebuild
index dd065be2dd5..4b9f1601d96 100644
--- a/media-gfx/sam2p/sam2p-0.49.2.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
-HOMEPAGE="https://code.google.com/p/sam2p/;
-SRC_URI="https://sam2p.googlecode.com/files/${P}.tar.gz;
+HOMEPAGE="https://github.com/pts/sam2p;
+SRC_URI="https://github.com/pts/${PN}/releases/download/v${PV}/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-12-03 Thread Sergei Trofimovich 
commit: ad220ab41607643fc00abeec9c09cbfbe37722ad
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec  3 18:44:59 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec  3 18:45:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad220ab4

media-gfx/sam2p: stable 0.49.3 for hppa, bug #617014

Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

 media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index b135825759b..c6eb44f5fa9 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz 
-> ${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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-06-30 Thread Sergei Trofimovich 
commit: 937e23d720bd1df3cb0de716b2c445d90df883a1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jun 30 07:11:12 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jun 30 07:11:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=937e23d7

media-gfx/sam2p: ia64 stable, bug #617014

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 178e4dcf16a..c15ca3dd519 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz 
-> ${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"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-06-25 Thread Markus Meier 
commit: aff19df25392ed12c4ae2d858bd66a2783430598
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Jun 25 07:22:47 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Jun 25 07:22:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff19df2

media-gfx/sam2p: arm stable, bug #617014

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 8ab3dff2da4..5b793de3148 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz 
-> ${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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-06-21 Thread Agostino Sarubbo 
commit: adbf95538107c1c8dfcec695f39e7a57326c44f9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 21 12:15:40 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 21 12:17:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adbf9553

media-gfx/sam2p: ppc64 stable wrt bug #617014

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 77f513c9907..8ab3dff2da4 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz 
-> ${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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-06-19 Thread Agostino Sarubbo 
commit: 96b6d713ec9b5394535322bf7d65afdc3e5df582
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun 20 05:16:30 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun 20 05:16:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b6d713

media-gfx/sam2p: x86 stable wrt bug #617014

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 7e85e80a469..9034fde323b 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz 
-> ${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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-06-19 Thread Agostino Sarubbo 
commit: 2ed2e39770eac16504882c2537457299042f3c40
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun 20 05:07:09 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun 20 05:07:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed2e397

media-gfx/sam2p: amd64 stable wrt bug #617014

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 1cdef4865dc..7e85e80a469 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz 
-> ${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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/

2017-06-17 Thread Alexis Ballier 
commit: 86b4c3f441aa74d23651e29101bc095f665b9b74
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jun 17 09:58:29 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jun 17 11:10:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b4c3f4

media-gfx/sam2p: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-gfx/sam2p/sam2p-0.49.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index d27c1270348..1cdef4865dc 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz 
-> ${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/, media-gfx/sam2p/

2017-05-15 Thread Alexis Ballier 
commit: ffb4b769ec24ec1e0801375dadacffd557b6ce75
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon May 15 15:23:05 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon May 15 15:23:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb4b769

media-gfx/sam2p: Import upstream fix to build with perl 5.26, bug #617014

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch | 23 +++
 media-gfx/sam2p/sam2p-0.49.3.ebuild  |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch 
b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
new file mode 100644
index 000..cb24dbda1bd
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
@@ -0,0 +1,23 @@
+commit 79a7de171f461a1c79089fa770f0da186e87c723
+Author: Peter Szabo 
+Date:   Sun Apr 30 04:00:23 2017 +0200
+
+fixed Perl 5.26 compatibility for perl -x 
(https://github.com/pts/sam2p/issues/2)
+
+diff --git a/Makefile b/Makefile
+index 849b09d..1791a9c 100644
+--- a/Makefile
 b/Makefile
+@@ -71,10 +71,10 @@ sam2p_version.h: debian/changelog
+ sam2p_main.o: sam2p_version.h
+ 
+ xpmc.h: cols2.pl
+-  perl -x cols2.pl >xpmc.h
++  perl -x ./cols2.pl >xpmc.h
+ 
+ #HQ=perl -e'$$_=join"",; s@([^\w\.\/\-])@sprintf"\\%03o",ord$$1@ge; 
print "\"$$_\"\n"'
+-HQ=perl -x hq.pl
++HQ=perl -x ./hq.pl
+ #%.tth: %.tte
+ # <$< >$@ $(HQ)
+ #%.tth: %.ttm

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild 
b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 446f3a38cd3..d27c1270348 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DEPEND="dev-lang/perl"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
+PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch 
"${FILESDIR}/${P}-perl526.patch" )
 
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/

2017-01-04 Thread David Seifert 
commit: f75fc95b5672afeff3da21c6a46710b9aa1813a0
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Dec 29 19:02:10 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan  4 10:14:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75fc95b

media-gfx/sam2p: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3276

 media-gfx/sam2p/files/sam2p-0.45-cflags.patch  | 37 --
 media-gfx/sam2p/files/sam2p-0.45-nostrip.patch | 13 -
 2 files changed, 50 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-0.45-cflags.patch 
b/media-gfx/sam2p/files/sam2p-0.45-cflags.patch
deleted file mode 100644
index d6636d5..
--- a/media-gfx/sam2p/files/sam2p-0.45-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: sam2p-0.45/configure.in
-===
 sam2p-0.45.orig/configure.in
-+++ sam2p-0.45/configure.in
-@@ -81,7 +81,7 @@ fi
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
-+#CXXFLAGS=" "
- dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
- CCC="$CCC g++"
- dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
-@@ -215,7 +215,7 @@ AC_OUTPUT(Makehelp)
- 
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot 
compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
- 
-Index: sam2p-0.45/Makefile
-===
 sam2p-0.45.orig/Makefile
-+++ sam2p-0.45/Makefile
-@@ -49,8 +49,8 @@ IDE_MODES := release debug
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX)
-+CXD_no =$(CXX) -DNDEBUG
- # CXD_yes=$(CXX) $(GFLAG) -lefence
- CXD_yes=$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)

diff --git a/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch 
b/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch
deleted file mode 100644
index d60a77c..
--- a/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sam2p-0.45/Makefile
-===
 sam2p-0.45.orig/Makefile
-+++ sam2p-0.45/Makefile
-@@ -17,7 +17,7 @@ PERL_BADLANG=x
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/

2016-10-28 Thread David Seifert 
commit: 1e4d9bfb79505198acd14497f4da8841ef7b314e
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Fri Oct 28 15:53:26 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Oct 28 22:30:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4d9bfb

media-gfx/sam2p: version bump to 0.49.3

Gentoo-bug: 585630, 598362
- Switch to EAPI 6
- Simplify ebuild
- Update to new HOMEPAGE

Signed off by: Jonathan Scruggs (j.scrugs  gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/2688

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

 media-gfx/sam2p/Manifest   |   1 +
 .../sam2p/files/sam2p-0.49.3-build-fixes.patch | 160 +
 media-gfx/sam2p/sam2p-0.49.3.ebuild|  48 +++
 3 files changed, 209 insertions(+)

diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 639fc75..845eb43 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,2 +1,3 @@
 DIST sam2p-0.49.1.tar.gz 562304 SHA256 
d97a270e3ad4ad138378b5fcb10e489e9af48a8150f308458771808dfceb069a SHA512 
58565fdcb7c450ad23c2971b70f0362dbf4ecfd8c4dedf19c25b56fc98c8799696c6ecf75d47650bc3b21f88b8454d7c4e6b206f7c0ae0e5de35d608262c1220
 WHIRLPOOL 
809512e56f7e0b4ac0b8a00be1da1088a1249fbccf1b59470b4e25036ffdaf36884374c7735bad6a3440166e835c02ade7f87dc9eb00b92b84382602884517d5
 DIST sam2p-0.49.2.tar.gz 562733 SHA256 
0e75d94bed380f8d8bd629f7797a0ca533b5d0b40eba2dab339146dedc1f79bf SHA512 
8e4d629df192381bddf8468687c6a41d459b70788a5e9defc68d5497f855cbae838f2f6f924237b17e4a8e6fbf982fb2709615c8fb1d9c8cec5ec7ecf91ec6ce
 WHIRLPOOL 
90ede2ba7b8f1dbc056cfdcfbaedd3cc995ccb58439050d6b4c51ab24a33f91b022110ea3a72ffe8b72e42f9104e936511fdbcdc1bf579fdac26c145ff2bb949
+DIST sam2p-0.49.3.tar.gz 2184864 SHA256 
687210c3ccd12da646db2a6e53f2de5a3a7639a7bcb0c381a61789eca50a824d SHA512 
9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
 WHIRLPOOL 
5362348d1955f67ae6f64b72ec0d53e88e21c46d281e3e844329059f7d0f2c4a1ac2b2faeca48c1a923fbbbcff1c9732bb016192c001a2de1970197a17051f9b

diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch 
b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
new file mode 100644
index ..dfad65c
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
@@ -0,0 +1,160 @@
+Fix literal suffix errors in C++14, caused by missing spaces between
+C-strings and macros.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=585630
+
+--- a/configure.in
 b/configure.in
+@@ -81,8 +81,6 @@
+ dnl Checks for programs.
+ dnl AC_PROG_CC
+ AC_LANG_CPLUSPLUS
+-CXXFLAGS=" "
+-dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
+ CCC="$CCC g++"
+ dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
+ AC_PROG_CXX
+@@ -216,7 +214,7 @@
+ 
+ dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot 
compute depends)])
+ rm -f Makedep
+-AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
++AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
+ AC_PTS_OK
+ echo "configure done. Now you should run: make; make install"
+ 
+--- a/gensio.cpp
 b/gensio.cpp
+@@ -494,7 +494,7 @@
+ 
+  #if HAVE_PTS_POPEN
+   if (!tmpsname) {
+-if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
++if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
+ signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if 
child cannot read our data */
+   } else {
+  #else
+@@ -622,7 +622,7 @@
+   if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' 
*/
+#if HAVE_PTS_POPEN
+ if (!tmpsname) {
+-  if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
++  if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) 
Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << 
(SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
+   signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals 
if child cannot read our data */
+   vi_precopy();
+   in.vi_read(0,0);
+@@ -730,12 +730,7 @@
+ 
+ /* --- */
+ 
+-
+-#if HAVE_lstat_in_sys_stat
+-#  define PTS_lstat lstat
+-#else
+ #  define PTS_lstat stat
+-#endif
+ 
+ /** @param fname must start with '/' (dir separator)
+  * @return true if file successfully created
+--- a/in_ps.cpp
 b/in_ps.cpp
+@@ -137,7 +137,7 @@
+ // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g 
%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury);
+ /*