Repackage build system and eliminate eautoreconf to work around bug 443074.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

6 files changed, 26 insertions, 43 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/Manifest b/app-text/sgml-common/Manifest
index 283a3168724a..878ce49246ab 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,9 +1,16 @@
-AUX sgml-common-0.6.3-configure.in.patch 360 SHA256 c1377215a0a92526cfa476dff941d00a713d156667ce37c39bf3f0fa02b71ad4 SHA512 4b954be0cc8363812d41e190594fa9f90918baf665e31cb0986b6aa08b33ea17fc9a89f5a01afab73f084ce2fb578b70797c06808368bc412ea852f5cc9dd5a7 WHIRLPOOL 7a85c0cb955211d6880cec53a6eb560fffd06885fbf91a2e963ac6e7b8e8a82b8038345f427511596e9a2399411562a55e9984cc7a72e55bed95650829f295a0
-AUX sgml-common-0.6.3-htmldir.patch 138 SHA256 d49182c2916e40fb741e4d3eda76ca57f9f899ecabedfc83cb0584e919800bca SHA512 569c7e290c8ac045fe2710c82dbb1309001e1d9a1e7a8f060a7299d7998169733ed59f0589dca998e337f1cf2a752fd28bd27f0d7ee5693b238b3a87e99a23cd WHIRLPOOL 7e8a643443b077a9694fbae1cedc85a2f794f5ce8ab9042ff99478c70bf2f0d87e83fe4e8b516d8e257f4184d3867ffc5c1f30acadda72a59e834a0d2f0b1d7f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX sgml-common-0.6.3-install-catalog.in 5064 SHA256 dffad899948ae7177b33e1c3132f9b7c6ea9e3f5a6d1e34b9334b91e54cc5fa6 SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9 WHIRLPOOL a25ad29a334b38d794e52ac5a04232d319ffa109d3130e2d9a89868548090a1001c512c75bd67f9335fd6d0a898bae673692106238e7ebe1a876d3dd45717e2f
-AUX sgml-common-0.6.3-man_MANS.patch 326 SHA256 9920e8557a79af593450e7fcc518e59a277df542afb815bc98eb5dd802f3f73b SHA512 988733ea6c2ed873a515ab5d3d7e8a3016d40c627a6d45b0d45bf4743c2ede61254aba8a5998327142aa528a3e4ef91f35c992ee87bddb51ac794bcfcc1babd6 WHIRLPOOL e738d5cf54c4aa49e6a927b51403ef0c4b54a1cb4b33d5a0408fa2517216b0717daa90fa63a25a2f1a9746de091888116fd1768d5edfe63581d6bfbc96d39abe
 AUX sgml-common-0.6.3-prefix.patch 658 SHA256 6926c44655ddd713276cc26d777d39b56b3cc740e55bbc2c543daad21359bee3 SHA512 25e02afb59be7c056577169a5c644a2fa6800bf07c5876fac3f9ad6b3094ee186b1864f59ae2fcbb99acb7f0d6e0d32f8daeb2aeec16f8f2f98d43b3e890ef7d WHIRLPOOL f7b7ee85138b5e7f89f7fb88653d416dcf534530535aec3fb3fe84fd51e49d84b0745f529f412faf29bc7d2b000331d214a6952ad71833c4d0b08be7119052da
-DIST sgml-common-0.6.3.tgz 76783 SHA256 7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959 SHA512 3c4a55f555596b2a6bf6af66c497679226e7b40625ac16832150488311cba7f9fc523435eea5837262a5517f5c09c4c0e07fe4a2cf02184d4027609c26e4bc0c WHIRLPOOL a17f6d06a5fe8f22edaeb0a2aef7b346b529704a1bc3e036c9d6f4d22389c2d41c18ae6633ffdb8bd83840fa9d901be42197ea38d865158e1e2eeb5a5657a675
-EBUILD sgml-common-0.6.3-r5.ebuild 2685 SHA256 9cb8de8a6c4fa7559c70bbb56f8dade9b698e085927602fe932c6291284b1b7c SHA512 7e5dfc28030797dedc0d57ab96e2d96281ab32e22be365dc59e400ee3f4910ed971e20eec12826b99c5cb6fabb2c6665219c0a12410cfc28d16030a232ebb0f4 WHIRLPOOL a855f4129e528c55cc33965349947de1d37281fae9f67974e7203adb2f35cf76826b5b268cc843e310b43ca712f3ee22b1cb65b9015ef9b4355927035582177b
-MISC ChangeLog 8597 SHA256 c5cd3f65c0e3f5ea6955a83939e43cac04649ba901fa5a514b0feaba444e72b8 SHA512 5e3ef1d4d4265508b54a75d13a7f4a9d7db0609fcbc4b12af407a3af00c1069b6abbd138bdc47e20317e907e06748499109667f7e397ce0e0e25bd9524207ccc WHIRLPOOL a3cbfcbbf65ac37c128a5c7120c1ec6711659ae1832bd3efccd44d5cb12f49acaaa7c9e9f4f097a5fd362445d9668b14fd057c529175eebfb61b55c58c2f51f6
+DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772
+EBUILD sgml-common-0.6.3-r5.ebuild 2602 SHA256 78c968cb0567986bde4edae5e3136ff3d9cfab51255b108aaf7b8a701177e1a1 SHA512 10cbdec1f75c6790aa367e8788252489a36f401bcdda4ddba6c61f4c0a4e277429ad13f0ba3f07776a18030d97ec4c5babc41ef433ee4d104c95f7547fb5981d WHIRLPOOL 121b124c966fc598305c386e39c6673d76fb95433c7f25af4a8861536e12be13ec94735c9365401ea55ca1a44fc7a9d17287bad1e14059f0b100d11d15aa3030
+MISC ChangeLog 8885 SHA256 73d8c0c461d5def67d188c834bb688e4a2cf9b32a6537f57dc5d92b2667b129b SHA512 9becba92d7ddc3ae88c08146675ddda5720c5e4a62e7f4a1e0ab9d6d92a6130b03861b7fe9da6afff3f969414dfd8c2ab6b60d3e5c01b20139ec8e1453e11c6f WHIRLPOOL 3f524fd73f88424796848da30d23e133f9c4323b1874c956a1f7eba74f4cb5f93cf038054dba90eee3998caee0e8e75ef837afb354dcd3145e023d7f6f606f94
 MISC metadata.xml 159 SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 SHA512 119d9e98ba4d956ad7811e557e8013b976337b14029b994bfa4eb08ba24cfe6ae7757a814a02c0526246b3c77ce1eb55b81681731863a10b72436dbe47e693d2 WHIRLPOOL a6d40a902f676b47e088ee88d7149fa3c2d6e8ac1117a265e083196abdb95483f506974afbdcfdcb3e6a14a85d4726ba2876d7cfb90efa8586a3d1581f30274b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDlISgACgkQC77qH+pIQ6TDsgEAq2dujSmKLqRx1pKJp2gwMV8I
+sZhQyECDn9YrHwffoQkBAMGxCG3C2loFUkVsBWLDVLpzWBalbdKaFEsE+uhBOHQj
+=tZRI
+-----END PGP SIGNATURE-----
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() {