diff options
5 files changed, 13 insertions, 37 deletions
diff --git a/app-text/sgml-common/ChangeLog b/app-text/sgml-common/ChangeLog index 1b2eb3f7905a..ba551230205a 100644 --- a/app-text/sgml-common/ChangeLog +++ b/app-text/sgml-common/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/sgml-common -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.58 2012/04/26 17:13:10 aballier Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.59 2013/01/03 06:11:51 floppym Exp $ + + 03 Jan 2013; Mike Gilbert <floppym@gentoo.org> + -files/sgml-common-0.6.3-configure.in.patch, + -files/sgml-common-0.6.3-htmldir.patch, + -files/sgml-common-0.6.3-man_MANS.patch, sgml-common-0.6.3-r5.ebuild: + Repackage build system and eliminate eautoreconf to work around bug 443074. 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> sgml-common-0.6.3-r5.ebuild: diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch b/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch deleted file mode 100644 index 85e25031b524..000000000000 --- a/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: sgml-common-0.6.3/configure.in -=================================================================== ---- sgml-common-0.6.3.orig/configure.in -+++ sgml-common-0.6.3/configure.in -@@ -3,7 +3,7 @@ AC_INIT(Makefile.am) - - AM_INIT_AUTOMAKE(sgml-common, 0.6.3) - --docdir='$(prefix)/doc' -+docdir='$(prefix)/share/doc' - AC_SUBST(docdir) - - dnl Checks for programs. diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-htmldir.patch b/app-text/sgml-common/files/sgml-common-0.6.3-htmldir.patch deleted file mode 100644 index 33daec6109c7..000000000000 --- a/app-text/sgml-common/files/sgml-common-0.6.3-htmldir.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/doc/HTML/Makefile.am -+++ b/doc/HTML/Makefile.am -@@ -1,2 +1 @@ --htmldir = $(docdir)/sgml-common-@VERSION@/html - html_DATA = *.html diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-man_MANS.patch b/app-text/sgml-common/files/sgml-common-0.6.3-man_MANS.patch deleted file mode 100644 index 21efb02552a8..000000000000 --- a/app-text/sgml-common/files/sgml-common-0.6.3-man_MANS.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff -ur sgml-common-0.6.3.orig/doc/man/Makefile.am sgml-common-0.6.3/doc/man/Makefile.am ---- sgml-common-0.6.3.orig/doc/man/Makefile.am 2001-01-30 16:42:22.000000000 +0200 -+++ sgml-common-0.6.3/doc/man/Makefile.am 2009-07-19 14:09:48.000000000 +0300 -@@ -1,2 +1 @@ --man8dir = $(mandir)/man8 --man8_DATA = *.8 -+man_MANS = *.8 diff --git a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild index e2da59c5034b..f39ce88cb6b3 100644 --- a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild +++ b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.25 2012/04/26 17:13:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.26 2013/01/03 06:11:51 floppym Exp $ EAPI="3" -inherit autotools eutils prefix +inherit eutils prefix DESCRIPTION="Base ISO character entities and utilities for SGML" HOMEPAGE="http://www.iso.ch/cate/3524030.html" -SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz" +#SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz" +SRC_URI="http://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -25,12 +26,6 @@ src_prepare() { epatch "${FILESDIR}"/${P}-prefix.patch eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf - - epatch "${FILESDIR}"/${P}-configure.in.patch - epatch "${FILESDIR}"/${P}-man_MANS.patch - epatch "${FILESDIR}"/${P}-htmldir.patch - - eautoreconf } src_configure() { |