Version bump #125752 by Beech Horn et al and fix by Thomas Holder for #127723.

Package-Manager: portage-2.1_pre7-r4

5 files changed, 185 insertions, 4 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 0c49bfd027cc..0ed0045edb68 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.25 2006/01/10 18:49:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.26 2006/04/09 17:46:19 vapier Exp $
+
+*fontforge-20060406 (09 Apr 2006)
+
+  09 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/fontforge-20060406-respect-HOME.patch, +fontforge-20060406.ebuild:
+  Version bump #125752 by Beech Horn et al and fix by Thomas Holder for #127723.
 
   10 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
   fontforge-20050624.ebuild:
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 1bf927f3917e..bf9067692ef4 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,18 +1,37 @@
-MD5 fbcc274564e3fdbad9db2c6540b6f044 ChangeLog 3843
-RMD160 e332071df13993e26d0ec474d1a15612bde1d7a4 ChangeLog 3843
-SHA256 89df626e9a1bf94c9c19d70b2e5e32b878f1c72fa0f0f2ab279bf4fe1975a3c2 ChangeLog 3843
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b96b4e723a79a938cdf57479fbd88f10 ChangeLog 4086
+RMD160 9de548b5012599db4aa0706f84a290f33b21b44c ChangeLog 4086
+SHA256 3a0ddc32453b87a7880cb31f986ab3f3282e17594b1e1091f972188630d94b22 ChangeLog 4086
 MD5 c2f2a20ada47b08aac3dd88ccf55864c files/digest-fontforge-20050502 73
 RMD160 7a954e504bdd3f366b3e9c647d7413883cd1f1bd files/digest-fontforge-20050502 73
 SHA256 94c0279d6c1450ceee467a7854c7d0bbaf1e6d6e2ed1fed4ea453337dc049b55 files/digest-fontforge-20050502 73
 MD5 b5f7c338b5ca0ba3c431716b8a327583 files/digest-fontforge-20050624 73
 RMD160 d0a85a217a360dc6e1fa7fa92862ef986adcc816 files/digest-fontforge-20050624 73
 SHA256 dccf124957ca9e291b7492c3c25a5728cadad5c22ce671587b471991da69fb1f files/digest-fontforge-20050624 73
+MD5 75d0095af1970634f0273409c3f36c47 files/digest-fontforge-20060406 277
+RMD160 8614785d14885a7c1e64a35accbaef982236d342 files/digest-fontforge-20060406 277
+SHA256 087ccbbf8163c0187f64b3230a3e1263f1c613cfa1e7fd9517441579331a0a6d files/digest-fontforge-20060406 277
+MD5 1f46dbe3d2a0d17339b841aa6de03f5e files/fontforge-20060406-respect-HOME.patch 2389
+RMD160 2e2c2a10d5be6720c76a70b36d774078a33e6379 files/fontforge-20060406-respect-HOME.patch 2389
+SHA256 00881a8bb8be4910ecd3dcce3887639659dad7bd974b1df3ee086fa346aeea21 files/fontforge-20060406-respect-HOME.patch 2389
 MD5 355172b88eb164abfffd97ca33649480 fontforge-20050502.ebuild 1267
 RMD160 44596882c960340f033913a2b0955e9de833c384 fontforge-20050502.ebuild 1267
 SHA256 b75531557bfe8d66c83302e1798ae188202bb9abdd50a1295eeeca6d88917cbc fontforge-20050502.ebuild 1267
 MD5 38db3cc373b7cfbe34bf93a7e6ba67e2 fontforge-20050624.ebuild 1288
 RMD160 05abe5da84fe99f570be0a885e7e8e8cfc788a60 fontforge-20050624.ebuild 1288
 SHA256 513a57fbc4a3ef6148fe8b639e9d610008dda2f1449c587446b38074044f55a2 fontforge-20050624.ebuild 1288
+MD5 8e48525b6a1cd8eb65a6a82facf99d69 fontforge-20060406.ebuild 1282
+RMD160 94854816234c267faf948322adc9f16dc2ffc712 fontforge-20060406.ebuild 1282
+SHA256 ac2d8e7a933109508eea8f94e2ae710fe8c33873bbc6adb6a6492715d5fc6a7c fontforge-20060406.ebuild 1282
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca metadata.xml 158
 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEOUi62+ySkm8kpY0RAudoAJ9IiTJlwHZ2UMmXikrIBCR/1zAiigCfaNNb
+509NOmr5kz6IbrrRIMedWFM=
+=uHlQ
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/files/digest-fontforge-20060406 b/media-gfx/fontforge/files/digest-fontforge-20060406
new file mode 100644
index 000000000000..1750f02e0f5a
--- /dev/null
+++ b/media-gfx/fontforge/files/digest-fontforge-20060406
@@ -0,0 +1,3 @@
+MD5 33aabad96a007b90679c392807e6eb7d fontforge_full-20060406.tar.bz2 3168350
+RMD160 7e8c3445f2b105d215b2ebce8e1a1df866397dad fontforge_full-20060406.tar.bz2 3168350
+SHA256 2dd9083bd7c3044e24595a272434919ed2f150b773a31fdac08d747c331703b0 fontforge_full-20060406.tar.bz2 3168350
diff --git a/media-gfx/fontforge/files/fontforge-20060406-respect-HOME.patch b/media-gfx/fontforge/files/fontforge-20060406-respect-HOME.patch
new file mode 100644
index 000000000000..016a8ac53684
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20060406-respect-HOME.patch
@@ -0,0 +1,106 @@
+--- fontforge/diffstubs.c
++++ fontforge/diffstubs.c
+@@ -1070,12 +1070,13 @@ return( dir = g_get_home_dir());
+ # include <pwd.h>
+ 
+ static char *gethomedir(void) {
+-    static char *dir=NULL;
++    static char *dir;
+     int uid;
+     struct passwd *pw;
+ 
++	dir = getenv("HOME");
+     if ( dir!=NULL )
+-return( dir );
++return( strdup(dir) );
+ 
+     uid = getuid();
+     while ( (pw=getpwent())!=NULL ) {
+@@ -1087,21 +1088,17 @@ return( dir );
+     }
+     endpwent();
+ 
+-    if ( (dir=getenv("HOME"))!=NULL )
+-return( (dir=strdup(dir)) );
+-
+ return( NULL );
+ }
+ #endif
+ 
+ char *getPfaEditDir(char *buffer) {
+-    static char *dir=NULL;
++    char *dir=gethomedir();
+ 
+-    if ( dir!=NULL )
+-return( dir );
+-    if ( gethomedir()==NULL )
++    if ( dir==NULL )
+ return( NULL );
+-    sprintf(buffer,"%s/.PfaEdit", gethomedir());
++    sprintf(buffer,"%s/.PfaEdit", dir);
++    free(dir);
+     if ( access(buffer,F_OK)==-1 )
+ 	if ( mkdir(buffer,0700)==-1 )
+ return( NULL );
+--- fontforge/autosave.c
++++ fontforge/autosave.c
+@@ -48,12 +48,13 @@ return( dir = g_get_home_dir());
+ # include <pwd.h>
+ 
+ static char *gethomedir(void) {
+-    static char *dir=NULL;
++    static char *dir;
+     int uid;
+     struct passwd *pw;
+ 
++	dir = getenv("HOME");
+     if ( dir!=NULL )
+-return( dir );
++return( strdup(dir) );
+ 
+     uid = getuid();
+     while ( (pw=getpwent())!=NULL ) {
+@@ -65,21 +66,17 @@ return( dir );
+     }
+     endpwent();
+ 
+-    if ( (dir=getenv("HOME"))!=NULL )
+-return( (dir=strdup(dir)) );
+-
+ return( NULL );
+ }
+ #endif
+ 
+ char *getPfaEditDir(char *buffer) {
+-    static char *dir=NULL;
++    char *dir=gethomedir();
+ 
+-    if ( dir!=NULL )
+-return( dir );
+-    if ( gethomedir()==NULL )
++    if ( dir==NULL )
+ return( NULL );
+-    sprintf(buffer,"%s/.PfaEdit", gethomedir());
++    sprintf(buffer,"%s/.PfaEdit", dir);
++    free(dir);
+     if ( access(buffer,F_OK)==-1 )
+ 	if ( mkdir(buffer,0700)==-1 )
+ return( NULL );
+@@ -88,13 +85,12 @@ return( dir );
+ }
+ 
+ static char *getAutoDirName(char *buffer) {
+-    static char *dir=NULL;
++    char *dir=getPfaEditDir(buffer);
+ 
+-    if ( dir!=NULL )
+-return( dir );
+-    if ( getPfaEditDir(buffer)==NULL )
++    if ( dir==NULL )
+ return( NULL );
+-    sprintf(buffer,"%s/autosave", getPfaEditDir(buffer));
++    sprintf(buffer,"%s/autosave", dir);
++    free(dir);
+     if ( access(buffer,F_OK)==-1 )
+ 	if ( mkdir(buffer,0700)==-1 )
+ return( NULL );
diff --git a/media-gfx/fontforge/fontforge-20060406.ebuild b/media-gfx/fontforge/fontforge-20060406.ebuild
new file mode 100644
index 000000000000..1bb333c104d5
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20060406.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060406.ebuild,v 1.1 2006/04/09 17:46:19 vapier Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+IUSE="png gif jpeg tiff truetype svg unicode X"
+
+DEPEND="png? ( >=media-libs/libpng-1.2.4 )
+	gif? ( >=media-libs/giflib-4.1.0-r1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7-r1 )
+	truetype? ( >=media-libs/freetype-2.1.4 )
+	svg? ( >=dev-libs/libxml2-2.6.7 )
+	unicode? ( >=media-libs/libuninameslist-030713 )
+	!media-gfx/pfaedit"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:ungif:gif:g' configure* || die
+	sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
+	epatch "${FILESDIR}"/${P}-respect-HOME.patch
+}
+
+src_compile() {
+	filter-mfpmath "sse" "387"
+
+	econf \
+		--with-multilayer \
+		--without-freetype-src \
+		$(use_with X x) \
+		|| die "econf failed"
+	make || die
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS README*
+}