Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 310777

Summary: EAPI=3 changes to sgml-catalog.eclass
Product: Gentoo Linux Reporter: Fabian Groffen <grobian>
Component: New packagesAssignee: Gentoo SGML project <sgml>
Status: RESOLVED FIXED    
Severity: normal CC: prefix
Priority: High    
Version: unspecified   
Hardware: All   
OS: All   
Whiteboard:
Package list:
Runtime testing required: ---
Bug Depends on:    
Bug Blocks: 315803    
Attachments: sgml-catalog.eclass patch

Description Fabian Groffen gentoo-dev 2010-03-22 18:50:40 UTC
--- docbook-dsssl-stylesheets-1.79.ebuild        2010-03-22 19:39:12.633902000 +0100
+++ docbook-dsssl-stylesheets-1.79.ebuild       2010-03-22 19:42:59.167115000 +0100
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79.ebuild,v 1.20 2008/07/04 08:49:24 eva Exp $
 
+EAPI="3"
+
 inherit sgml-catalog
 
 MY_P=${P/-stylesheets/}
@@ -34,14 +34,14 @@
 
 src_install() {
        make \
-               BINDIR="${D}/usr/bin" \
-               DESTDIR="${D}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}" \
+               BINDIR="${ED}/usr/bin" \
+               DESTDIR="${ED}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}" \
                install || die
 
        dodir /usr/share/sgml/stylesheets/dsssl/
 
-       if [ -d /usr/share/sgml/stylesheets/dsssl/docbook ] &&
-               [ ! -L /usr/share/sgml/stylesheets/dsssl/docbook ]
+       if [ -d "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ] &&
+               [ ! -L "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ]
        then
                ewarn "Not linking /usr/share/sgml/stylesheets/dsssl/docbook to"
                ewarn "/usr/share/sgml/docbook/dsssl-stylesheets-${PV}"


Please accept or comment on the proposed changes.  Note that EAPI=3 seems not to cause any problems with the sgml-catalog eclass, although it seems this eclass isn't aware of any EAPI at all.
Comment 1 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2010-03-23 14:34:15 UTC
http://overlays.gentoo.org/proj/alt/changeset/57545
Message:

    transferred app-text/docbook-dsssl-stylesheets 
Comment 2 Fabian Groffen gentoo-dev 2010-03-23 14:37:04 UTC
I promised to suggest a patch for EAPI=3 for sgml-catalog.eclass, hence I kept this bug open, hehe ;)
Comment 3 Fabian Groffen gentoo-dev 2010-03-26 15:44:30 UTC
Created attachment 225335 [details, diff]
sgml-catalog.eclass patch

The promised patch
Comment 4 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2010-05-13 21:38:38 UTC
Hi, I applied this to the tree. I think that 1.5 months is long enough to wait. I hope you agree.