Respect cflags, dont prestrip executables, call gmake for Makedep as GNU make is required, import a patch from bsd ports to make it build on fbsd, keyword ~x86-fbsd; install examples via examples useflag. There still remains that 'gmake Makedep' breaks if used with distcc, I couldn't fix it.

Package-Manager: portage-2.1.4.2

6 files changed, 137 insertions, 3 deletions

diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog
index 64a648ba75d2..4b61c7e9fc76 100644
--- a/media-gfx/sam2p/ChangeLog
+++ b/media-gfx/sam2p/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/sam2p
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.21 2007/12/18 19:18:26 jer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.22 2008/02/10 10:59:11 aballier Exp $
+
+*sam2p-0.45-r1 (10 Feb 2008)
+
+  10 Feb 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/sam2p-0.45-cflags.patch, +files/sam2p-0.45-fbsd.patch,
+  +files/sam2p-0.45-nostrip.patch, +sam2p-0.45-r1.ebuild:
+  Respect cflags, dont prestrip executables, call gmake for Makedep as GNU
+  make is required, import a patch from bsd ports to make it build on fbsd,
+  keyword ~x86-fbsd; install examples via examples useflag. There still
+  remains that 'gmake Makedep' breaks if used with distcc, I couldn't fix it.
 
   18 Dec 2007; Jeroen Roovers <jer@gentoo.org> sam2p-0.45.ebuild:
   Marked ~hppa (bug #195815).
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 4d3ffb2a32ea..faf9a3d75e35 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sam2p-0.45-cflags.patch 1294 RMD160 eeadcc13c88f1685cdbb15d50fe49ccc738f2a15 SHA1 0218fa834218e51937625b9e0168c709db5fb7a0 SHA256 31fec5d1396185336d33e0ed2d0b005264f4af6b8c63b6b39a2947d07e69ca9e
+AUX sam2p-0.45-fbsd.patch 319 RMD160 7f4afe0d92224471aa2ad96eeefe9e9fa05c2db1 SHA1 24522fb8171c52249cbb57c52d16ae9e6196cc5a SHA256 44944d770cb7dc515c54b325d46451edefb89b73ac3b407374d18b7639a26d80
+AUX sam2p-0.45-nostrip.patch 346 RMD160 31f61d64c0013f8e35711068e3fcd8e878a320ae SHA1 2ea36b9fe1441246cb7b0443ac528932e82188f3 SHA256 5bb2ed5ac221bc2e27459b66510e3ca4c521f460f4fe4539439d582b35af9188
 DIST sam2p-0.44.tar.bz2 463314 RMD160 8d8b69ec079d4e9d5e340e5ab21d696e4a2848da SHA1 515f99dcbd4969c084051fc7f4edfb1accc8929a SHA256 0ca55917d9d80684c8d557b0e066707192bbf1dd9c68716652a5720cc032684a
 DIST sam2p-0.45.tar.bz2 434746 RMD160 122e81208f241a7e9d33bddd7df17780b306b305 SHA1 7bba06220ff755c9c68632644afa8ef2f26cab6f SHA256 ed109acb74445e926f39757d7f133b72903d92017da46f8ccb4f26624eb797ff
 EBUILD sam2p-0.44.ebuild 811 RMD160 8357c53b4647fa16f2f376ce6449ab6fa577aea0 SHA1 acaeb1327e1393303792c0027afaeb1555b09068 SHA256 51e4d620fad7540aa4f1f18f5826b8e083965415f6f047655edf5d0449b708e9
+EBUILD sam2p-0.45-r1.ebuild 1199 RMD160 21b687174d71ad6f2481159eeec1726402918469 SHA1 e84998985ad6c959618649dabc34cdd57d66dce5 SHA256 cab30ef3ba92699c059a3c622a2721d89d84d7cf189fea1a86997d00d4f4f177
 EBUILD sam2p-0.45.ebuild 842 RMD160 7ddf418effff8fb228b8605a6a5dd4e6d15e6e3a SHA1 40cf407a14afeb7b0a7b1da11040a5d3aa95bda7 SHA256 14c270e1b6e155ee688548a461bc9c924897241277dde352de6aae6f7b241e64
-MISC ChangeLog 2633 RMD160 cddaceea4621c79203a68c53a5a6787c1a0a8c37 SHA1 b937072f56057b6af38d2472e320d4a56977bf79 SHA256 405048f2974a005e89998831868daa43295131f104b62365df6a55191134fc8c
+MISC ChangeLog 3144 RMD160 4baf16bfbf1271325a8049b27f3ebd01973911f4 SHA1 91770d0d5412b312c0a35896c3d6e8e324335ccb SHA256 574b24dad1bea046635cf7f2b02af46904a4c2b46753a9298b71273fa9557aba
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHrtkGvFcC4BYPU0oRAlB9AJ0ahjUA+hhAT9+xJ+kzXLjQIRZicgCgmNco
+Ep5KDzgfF7j+NQk2eUitdxk=
+=Vvny
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/sam2p/files/sam2p-0.45-cflags.patch b/media-gfx/sam2p/files/sam2p-0.45-cflags.patch
new file mode 100644
index 000000000000..d6636d5308cf
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.45-cflags.patch
@@ -0,0 +1,37 @@
+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-fbsd.patch b/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
new file mode 100644
index 000000000000..aed13acf08dd
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
@@ -0,0 +1,14 @@
+--- gensio.cpp.orig	Fri 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.45-nostrip.patch b/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch
new file mode 100644
index 000000000000..d60a77c36207
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch
@@ -0,0 +1,13 @@
+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
diff --git a/media-gfx/sam2p/sam2p-0.45-r1.ebuild b/media-gfx/sam2p/sam2p-0.45-r1.ebuild
new file mode 100644
index 000000000000..4f29c7894536
--- /dev/null
+++ b/media-gfx/sam2p/sam2p-0.45-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45-r1.ebuild,v 1.1 2008/02/10 10:59:11 aballier Exp $
+
+inherit toolchain-funcs eutils autotools
+
+DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
+HOMEPAGE="http://www.inf.bme.hu/~pts/sam2p/"
+# The author refuses to distribute
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples gif"
+DEPEND="dev-lang/perl"
+RDEPEND="virtual/libc"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-cflags.patch"
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CXX
+	# Makedep fails with distcc
+	if has distcc ${FEATURES}; then
+		die "disable FEATURES=distcc"
+	fi
+	econf --enable-lzw $(use_enable gif) || die "econf failed"
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	dobin sam2p || die "Failed to install sam2p"
+	dodoc README
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+}