Remove the need for a few build-time deps, fixes bug 318475

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 23 insertions, 23 deletions

diff --git a/dev-util/gtk-doc-am/ChangeLog b/dev-util/gtk-doc-am/ChangeLog
index 78461bf3f9a6..2e1d0628f93d 100644
--- a/dev-util/gtk-doc-am/ChangeLog
+++ b/dev-util/gtk-doc-am/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/gtk-doc-am
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.55 2011/03/03 22:14:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/ChangeLog,v 1.56 2011/03/07 11:49:41 nirbheek Exp $
+
+  07 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gtk-doc-am-1.17.ebuild:
+  Remove the need for a few build-time deps, fixes bug 318475
 
 *gtk-doc-am-1.17 (03 Mar 2011)
 
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index 09276dcde9a5..4a15473b1048 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gtk-doc-1.15.tar.bz2 787687 RMD160 142ad9dca015ba69261fe44847f3a27721e06551 SHA1 fc1c593e8107cbe33451e3e938ca14b59104e999 SHA256 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831
 DIST gtk-doc-1.16.tar.bz2 831330 RMD160 d9c3bbe9b86a424bd2d1a6af3f197ec3d14b925e SHA1 151036314302a0393f484bacabc120e456337a61 SHA256 552fd0a5e2bb104a9d8d5afebcf2292fbee83cd115e9f903df89e4518343eefb
 DIST gtk-doc-1.17.tar.bz2 832128 RMD160 d5da89f92d671992797908357dcfa71286fac6df SHA1 15be7bf929c62d4ad7c335436617295bb5f4d735 SHA256 911ff8c620743cea7b40156f1947f9470da5e723f35a9d8fb683e50c61830d1f
 EBUILD gtk-doc-am-1.15.ebuild 1420 RMD160 9f0244c0961c6f693169691f19fd2904a296cbfd SHA1 3458a25c6e1853d799f1a778518535350ce68efa SHA256 c264e2c5d9255056f545ef50110c6af9336d0366637d164b7d241da4a7b6f479
 EBUILD gtk-doc-am-1.16.ebuild 1429 RMD160 6d1d9acde1c93cbc955a0ab490c8b0492337c325 SHA1 bc0755252e75fcd50ebc007be8bacfc6477252ac SHA256 baaae3f7add83b1c5ecb4829a31916f08a84b37d1fc8a37e89c08148e8bb53b7
-EBUILD gtk-doc-am-1.17.ebuild 1431 RMD160 7e6e60ebbee7b7fedc6852b7e77a3022ec48cd62 SHA1 6cddc4967047409f362eef5f038c66518d589c58 SHA256 c5223dcb780d8c50b13917adc339d4e9b83a1855164ac786af2467919f06e49b
-MISC ChangeLog 6632 RMD160 e169f8f4b3a73bca5ee1901c4e4e8d6290256111 SHA1 bf557c52b57b50328a9564f53f865cc52e95ab71 SHA256 5fe2c50cf1fbb42e1c1e52ec4338e606b444edb6328c1ea574865a7e0f2e3899
+EBUILD gtk-doc-am-1.17.ebuild 1728 RMD160 1a4037d97a647cb6a55dcba961734b15918c8a9b SHA1 071ce50e1c93f10f74cbfbdccfd8ce1925a6836e SHA256 46f60e38d53d3f8d126b06550aefad20eeb47494b2018623e89f4c53456c34c0
+MISC ChangeLog 6778 RMD160 17b6943d745e0a537842157d33cbd6b357b44828 SHA1 055cbe68209327f2adc9e87634585f7d924370e1 SHA256 0e202465edcd8356c0eeb33b8a0a8a5b393792bf0601bcfe6f80a4944ae94675
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk1wEtMACgkQCaWpQKGI+9R1XQCfWpUPIsSh4sToMYw8oYWUAq6u
-/iEAn1P3Ysa8z7EiM5TnZDHZUc149U7c
-=Q2iK
------END PGP SIGNATURE-----
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild
index f739a023ba2c..e075b118a412 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild,v 1.1 2011/03/03 22:14:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.17.ebuild,v 1.2 2011/03/07 11:49:41 nirbheek Exp $
 
 EAPI="3"
 
@@ -19,14 +19,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.6"
-
-DEPEND="${RDEPEND}
-	!<dev-util/gtk-doc-${MAJ_PV}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/pkgconfig-0.19"
+# pkg-config is used by gtkdoc-rebase at runtime
+RDEPEND=">=dev-lang/perl-5.6
+	dev-util/pkgconfig"
+DEPEND="${RDEPEND} 
+	!<dev-util/gtk-doc-${MAJ_PV}"
 
 # This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
 RESTRICT="test"
@@ -36,7 +33,15 @@ S=${WORKDIR}/${MY_P}
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
 
 src_configure() {
-	econf --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+	# Duplicate autoconf checks so we don't have to call configure
+	local PERL=$(type -P perl)
+
+	test -n "${PERL}" || die "Perl not found!"
+	"${PERL}" -e "require v5.6.0" || die "perl >= 5.6.0 is required for gtk-doc"
+
+	# Replicate AC_SUBST
+	sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \
+		"${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!"
 }
 
 src_compile() {
@@ -44,6 +49,7 @@ src_compile() {
 }
 
 src_install() {
+	fperms +x gtkdoc-rebase
 	exeinto /usr/bin/
 	doexe gtkdoc-rebase || die "doexe failed"