Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 353408 - Please review EAPI3/Gentoo Prefix changes for =media-gfx/transfig-3.2.5d
Summary: Please review EAPI3/Gentoo Prefix changes for =media-gfx/transfig-3.2.5d
Status: RESOLVED FIXED
Alias: None
Product: Gentoo/Alt
Classification: Unclassified
Component: Prefix Support (show other bugs)
Hardware: All All
: High enhancement (vote)
Assignee: Gentoo Prefix
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: prefix-gx86
  Show dependency tree
 
Reported: 2011-02-01 15:54 UTC by Jeremy Olexa (darkside) (RETIRED)
Modified: 2011-10-23 19:19 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2011-02-01 15:54:56 UTC
Here is an inline diff, please comment or give ok to commit to gentoo-x86. Thanks.

Index: transfig-3.2.5d.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.5d.ebuild,v
retrieving revision 1.9
diff -u -r1.9 transfig-3.2.5d.ebuild
--- transfig-3.2.5d.ebuild      9 Jan 2011 13:58:23 -0000       1.9
+++ transfig-3.2.5d.ebuild      1 Feb 2011 15:54:02 -0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.5d.ebuild,v
1.9 2011/01/09 13:58:23 ranger Exp $

-EAPI="2"
+EAPI="3"
 inherit toolchain-funcs eutils flag-o-matic
 
 MY_P=${PN}.${PV}
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm
@@ -29,12 +29,14 @@
 
 sed_Imakefile() {
        # see fig2dev/Imakefile for details
-       vars2subs="BINDIR=/usr/bin
-                       MANDIR=/usr/share/man/man\$\(MANSUFFIX\)
-                       XFIGLIBDIR=/usr/share/xfig
+       vars2subs="BINDIR=${EPREFIX}/usr/bin
+                       MANDIR=${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)
+                       XFIGLIBDIR=${EPREFIX}/usr/share/xfig
+                       PNGINC=-I${EPREFIX}/usr/include/X11
+                       XPMINC=-I${EPREFIX}/usr/include/X11
                        USEINLINE=-DUSE_INLINE
-                       RGB=/usr/share/X11/rgb.txt
-                       FIG2DEV_LIBDIR=/usr/share/fig2dev"
+                       RGB=${EPREFIX}/usr/share/X11/rgb.txt
+                       FIG2DEV_LIBDIR=${EPREFIX}/usr/share/fig2dev"
 
        for variable in ${vars2subs} ; do
                varname=${variable%%=*}
@@ -48,6 +50,7 @@
        find . -name Makefile -delete
        epatch "${FILESDIR}"/${P}-fig2mpdf.patch
        epatch "${FILESDIR}"/${PN}-3.2.5c-maxfontsize.patch
+       epatch "${FILESDIR}"/${PN}-3.2.5-solaris.patch
        sed -e 's:-L$(ZLIBDIR) -lz::' \
                -e 's: -lX11::' \
                        -i fig2dev/Imakefile || die
@@ -57,9 +60,15 @@
 src_compile() {
        xmkmf || die "xmkmf failed"
        emake Makefiles || die "make Makefiles failed"
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               # defining NOSTDHDRS really gets us into trouble on Solaris
+               # because it triggers a problem with a redeclaration of wchar_t, so
+               # kill the flag
+               sed -i -e 's/-DNOSTDHDRS//g' fig2dev/Makefile fig2dev/dev/Makefile
+       fi
 
        emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
-               USRLIBDIR=/usr/$(get_libdir) || die "emake failed"
+               USRLIBDIR="${EPREFIX}"/usr/$(get_libdir) || die "emake failed"
 }

 src_install() {
@@ -76,7 +85,7 @@

        dohtml "${WORKDIR}/fig2mpdf/doc/"* || die

-       mv "${D}"/usr/bin/fig2ps2tex{.sh,} || die #338295
+       mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295

        dodoc README CHANGES LATEX.AND.XFIG NOTES || die
 }
Comment 1 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2011-02-21 06:10:03 UTC
(In reply to comment #0)
> Here is an inline diff, please comment or give ok to commit to gentoo-x86.
> Thanks.

No response?
Comment 2 Peter Volkov (RETIRED) gentoo-dev 2011-05-01 10:00:05 UTC
Jeremy, I've applied all changes bug solaris bits/patch and keywords to transfig-3.2.5d-r1.ebuild. Please, add missing parts and put keywords in tree. Thank you for your work and sorry for delay.
Comment 3 Fabian Groffen gentoo-dev 2011-10-23 19:19:34 UTC
only the stat.h patch was necessary, so I added that one, and added Prefix keywords, thanks!