Added patch to fix segfault during translation, marked ppc stable for bug #288745. Pruned old versions.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 58 insertions, 78 deletions

diff --git a/media-gfx/flphoto/ChangeLog b/media-gfx/flphoto/ChangeLog
index f0b9fb490774..8ebe45557093 100644
--- a/media-gfx/flphoto/ChangeLog
+++ b/media-gfx/flphoto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/flphoto
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.18 2010/04/16 18:47:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.19 2010/06/01 14:18:04 josejx Exp $
+
+  01 Jun 2010; Joseph Jezak <josejx@gentoo.org> -flphoto-1.2.ebuild,
+  -flphoto-1.3.1.ebuild, flphoto-1.3.1-r1.ebuild, +files/espmsg.patch:
+  Added patch to fix segfault during translation, marked ppc stable for bug
+  #288745. Pruned old versions.
 
   16 Apr 2010; Markos Chandras <hwoarang@gentoo.org>
   flphoto-1.3.1-r1.ebuild:
diff --git a/media-gfx/flphoto/Manifest b/media-gfx/flphoto/Manifest
index bd4879eb81bf..fec112e5611f 100644
--- a/media-gfx/flphoto/Manifest
+++ b/media-gfx/flphoto/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX album.xml 288 RMD160 052add01b8967c9a564da488ec082f23974545f0 SHA1 62ea904cb231bba911fa7807a234a754b431b0b7 SHA256 6718e126eeeecf0b2f0225dc6c86f280d956384859605a65dbc9d53c5b30c236
+AUX espmsg.patch 966 RMD160 745348f6366fc6159255c4b69c42368ecb952172 SHA1 57564b8571edc56a8e357436483370880d637ef8 SHA256 12aadda040f205edfae4bdf3c536de03898b88bf2aa30d492d3b4c03e251625b
 AUX flphoto-1.3.1-glibc28.patch 394 RMD160 bfe4f8d82c2990b4ecc4be6138fd0b4206960956 SHA1 02c4640a56da12207c4adb97c45e41523fc336c3 SHA256 8452038decbd3a81c73e42e0cb07781de48a1268b92741c02eff8c298454172f
-DIST flphoto-1.2-source.tar.gz 526336 RMD160 7c0bca33ca51adb19e17c4c86b9bc335296b282e SHA1 d5203155e49d2cd5c2867ba57cc71d93ff2aa661 SHA256 9095bdd4ac1410f1ad7ae2e6c039f5f2e35f3fd1353e73eef1462f194c8e6fb7
 DIST flphoto-1.3.1-source.tar.gz 797714 RMD160 d8c99e6dbaa448f3590de3f961ba28a1cc3d706e SHA1 3486233c94a74d7f2ec9d325590c1d0191c91952 SHA256 c9e41fd45c584923bd749e6ff52ef39ceb3800f3122d8fd48904a980f6e2b9b3
-EBUILD flphoto-1.2.ebuild 793 RMD160 ab7f34ef6f4534df510b48289106d325311592fd SHA1 f97abe472c7b3c9ef35b03d2748c76c9e8c82141 SHA256 563d371e4de2f273d4f1ef217b6acfdc4e75603a430fa579fde40561acd3a171
-EBUILD flphoto-1.3.1-r1.ebuild 1210 RMD160 ca6daf06888b38abfb4fe243c052e9b81cfa6201 SHA1 18cb462efdbc20133d239f1697e36a3ab31b07f1 SHA256 8a9756b152f633ddaa717e8ef50b9f473dd9dac8f7e6fe38ed12416634f60e92
-EBUILD flphoto-1.3.1.ebuild 829 RMD160 6d7d70e662f42e54fd92c1e69c2a5b512c1c1003 SHA1 95f0803a740b85f7cbf01a9cfc8cbb3e6b7e03aa SHA256 97461e2f14960077cbffb3e9d715f32d27c470d0ea9f618bb26eb1e163113dbd
-MISC ChangeLog 2239 RMD160 42510a6eb7f8d8b61547e1da2781dfa3f8ab3462 SHA1 5c9e7753fd57d114caae460a5b0e2728b5709f5c SHA256 47b59d2915617eabc807682e37148df815aa2b5323394f7c201e2056f0920a0f
+EBUILD flphoto-1.3.1-r1.ebuild 1280 RMD160 2dc24e8bc36d701d41651dd5c0839d9e2fc1fdb8 SHA1 abb171412e96bcfdd010c22bd27097bb5dbfc144 SHA256 ffe485d48a5472e7117250d02dd783866ebf9366ee7ba6dde4c0dd3f8848b581
+MISC ChangeLog 2486 RMD160 fa4e47f4acb2e52cd265414a0cea98628a6b4215 SHA1 47d716a9d711bea571f5d5e2869ed97bcd6db21b SHA256 ac21821b3fd485b59c7e8bef9207a5bcdf003451eebb3e2f98e7ea911fdac673
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkwFFmcACgkQcsIHjyDViGTkcACg0ebVzwNagrHpJiXHdR7Ky6BY
+kG4AoI5c4x/v4bwapL1mnpskssecYsWQ
+=7B1R
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/flphoto/files/espmsg.patch b/media-gfx/flphoto/files/espmsg.patch
new file mode 100644
index 000000000000..7be3c29ce161
--- /dev/null
+++ b/media-gfx/flphoto/files/espmsg.patch
@@ -0,0 +1,35 @@
+--- espmsg.c	2005-01-23 03:52:44.000000000 +0000
++++ espmsg.c	2010-06-01 14:06:06.983548480 +0000
+@@ -270,14 +270,18 @@
+ compile_messages(const char *filename)	/* I - Message filename */
+ {
+   int		i;			/* Looping var */
+-  char		msgname[1024],		/* Message filename */
+-		orig[1024],		/* Original message text */
+-		text[1024],		/* Message text */
++  char 		*msgname,		/* Message filename */
++  		*orig, 			/* Original message text */
++		*text,			/* Message text */
+ 		*ptr;			/* Pointer into filename */
+   int		num_msgs;		/* Number of messages */
+   espmsg_t	*msgs;			/* Messages */
+   message_t	*temp;			/* Current message */
+ 
++  msgname = (char *)malloc(4096);
++  orig = (char *)malloc(4096);
++  text = (char *)malloc(4096);
++
+ 
+   num_msgs = 0;
+   msgs     = NULL;
+@@ -307,6 +311,10 @@
+            strerror(errno));
+   else
+     printf("espmsg: Compiled %d messages into \"%s\".\n", num_msgs, msgname);
++
++  free(msgname);
++  free(orig);
++  free(text);
+ }
+ 
+ 
diff --git a/media-gfx/flphoto/flphoto-1.2.ebuild b/media-gfx/flphoto/flphoto-1.2.ebuild
deleted file mode 100644
index 5827fda07cec..000000000000
--- a/media-gfx/flphoto/flphoto-1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.2.ebuild,v 1.8 2008/11/23 20:25:34 halcy0n Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
-HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
-SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="cups gphoto2"
-
-DEPEND=">=x11-libs/fltk-1.1.4:1.1
-	cups? ( net-print/cups )
-	gphoto2? ( media-gfx/gphoto2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/flphoto-1.3.1-glibc28.patch
-}
-
-src_compile() {
-	econf || die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild b/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild
index 77ebcaf86697..b3a09fd78e39 100644
--- a/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild
+++ b/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild,v 1.4 2010/04/16 18:47:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild,v 1.5 2010/06/01 14:18:04 josejx Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="cups gphoto2"
 
 DEPEND=">=x11-libs/fltk-1.1.4:1.1
@@ -30,6 +30,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/flphoto-1.3.1-glibc28.patch
+	### Patch to fix segfault on PowerPC
+	epatch "${FILESDIR}"/espmsg.patch
 }
 
 src_compile() {
diff --git a/media-gfx/flphoto/flphoto-1.3.1.ebuild b/media-gfx/flphoto/flphoto-1.3.1.ebuild
deleted file mode 100644
index 1a21cb2da172..000000000000
--- a/media-gfx/flphoto/flphoto-1.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1.ebuild,v 1.4 2010/01/19 12:14:06 cla Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
-HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
-SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cups gphoto2"
-
-DEPEND=">=x11-libs/fltk-1.1.4:1.1
-	cups? ( net-print/cups )
-	gphoto2? ( media-gfx/gphoto2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/flphoto-1.3.1-glibc28.patch
-}
-
-src_compile() {
-	econf --with-docdir=/usr/share/doc/${PF} || die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}