From: Tomas Chvatal Date: Fri, 16 Sep 2011 18:37:09 +0000 (+0000) Subject: Update the ebuild to eapi4, add static-libs useflag, punt libtool archive. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=690d7df707c284cb7babad4a67c65e740e603d19;p=gentoo.git Update the ebuild to eapi4, add static-libs useflag, punt libtool archive. Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog index b54cf2123acb..306dfa1529ed 100644 --- a/app-text/htmltidy/ChangeLog +++ b/app-text/htmltidy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/htmltidy -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.59 2010/12/01 14:54:15 flameeyes Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.60 2011/09/16 18:37:08 scarabeus Exp $ + + 16 Sep 2011; Tomáš Chvátal + -htmltidy-20090325.ebuild, htmltidy-20090325-r1.ebuild: + Update the ebuild to eapi4, add static-libs useflag, punt libtool archive. 01 Dec 2010; Diego E. Pettenò -files/03-html2db-null.patch, -files/04-htmltidy-docbook.patch, diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest index 403bdb6eed1b..c89bcf410239 100644 --- a/app-text/htmltidy/Manifest +++ b/app-text/htmltidy/Manifest @@ -1,38 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -- -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -- - -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX htmltidy-20090325-tidyrc.patch 923 RMD160 654fd948c82558e4620b684a960c65e68a87731a SHA1 68767808ad40ab60470340acc5cad50b41a9f0b7 SHA256 2953cab71d0363b3c53798e8405cef560a2026a4f4a044a9b21def11ab682811 AUX htmltidy-5.10.26-strip-O2-flag.patch 370 RMD160 1e531a13a61c80053cfb886a29cf2b4bafe45400 SHA1 f2b029ec14aede67b520c2376af27e594e9685dd SHA256 6acd356327faa4043a0b4cf5f242a5249d32c136fc39594701aca67ad70f353b DIST tidy-20090325-doc.tar.bz2 13319 RMD160 8fee995d8eb385e87ec9a3fcd27b9a18abc4beaf SHA1 72ec377341a50369beffae2ab4a2a75b26d65798 SHA256 be018829d24d5477556f3b72a426335ca21f62ca103b50a5d17c0e16ffd97956 DIST tidy-20090325.tar.bz2 382016 RMD160 796a025bc1b67ea64394c64a1455a582e9285982 SHA1 28c000a2cd40262fc0d7c2c429eb2a09b2df7bf4 SHA256 58099898f326eff209a97509d1879cee19812a8a7048e2143b39821d35d7b6bd -EBUILD htmltidy-20090325-r1.ebuild 2288 RMD160 2061c133a0806554342f8c5991a973359c66bb6c SHA1 4639607c246d1f7c63a6a6c03fcb9584241eb697 SHA256 1a156ce2bb54c34be1c8d7640b03f8acb1f1dc0a0d18a549af693699265e4356 -EBUILD htmltidy-20090325.ebuild 2075 RMD160 340b27d589bba2488ad8cd9a9d649183cf4ca30a SHA1 3ace7abc9e6e104db896aadd973ddd519f500223 SHA256 e6bf322ecdaa02c4206ef339f1d35a8dfe4bf05070427efa5a06eeb508006ab7 -MISC ChangeLog 8334 RMD160 38f3c2e5f173e3e15dcaaa5f42d425a7389f6ef1 SHA1 a63f43e8ec7729cf46f25ed5882d63fc6c454d9b SHA256 00c7e3cba079194c266ea9d17aae4359efe43dc0eac5a10a71869f490d16be16 +EBUILD htmltidy-20090325-r1.ebuild 2036 RMD160 e44eb6e345b09ebab0f5feb6885e260c6d9a86e2 SHA1 83875ebb08d4ccd2bc8332706f27841ddfd43c7f SHA256 2b9860ce372120664ceef70c51bec309c6ba9889f8e6648fbec70d981f908291 +MISC ChangeLog 8525 RMD160 a37dc8947c25044fc9d40dc64e4354bfd855aec2 SHA1 3fa7c4270c7f5e0bc4eb1bfc16c3a313c8688a70 SHA256 ab53dcfd30faf6714620ca30f7d7c4f3e385aaaa1ccbe275748ff2966035c7ef MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 -- - -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkz2YTUACgkQAiZjviIA2Xid1ACgg7s29qF+kJEIGtq/bEDY4Jm8 -sBsAoOD1/ynotUV5P+xJFePvjz8GaYoW -=eljP -- - -----END PGP SIGNATURE----- -- -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkz2YnIACgkQAiZjviIA2XgerQCgpjvUFt8mM7ctAQVQ6SxxZhwC -8AsAn3A8eKbyqtnuenHGogP2IEQ9FpwP -=ZxG1 -- -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAkz2ZBYACgkQAiZjviIA2XjZngCgtNeeJe7IWfJ8rklCmk7haFN7 -JT8AoMGrjZBXKVOeK7nvRMfWXPwxDIef -=sF6i +iQIcBAEBAgAGBQJOc5dtAAoJEOSiRoyO7jvo/koQAICYAQEqeKNqIxmkUmNPjvwo +16eVuz80yJff7pG574n5OPEZWJp6i8OPLou82omvI/B6OdoyziSaqUEdklOPFAgG +Kcc43rWQmcy2VCv8OHdDDfWO9Gr3jXxOz5dkwY/pL7/oWP3cnCp3r40UNVVebKiq +HNW6H8YSNwB7855YYtGs8gIxEx2FaQ7Q0YeoLuiRmqK4Hf28kjhA5SaeyoJ++AYr +8nv/QGvHsHhPPmst+zyrmL4NyFBgOXkVD3v3L4Qinv0kyRy3+sh6mLLFd0WeMGh6 +tQMo9f418vRMO8VOHGDrg1Jz74RDPM+b3z7KQWpcyhyyC6Cd0Sy+gL1MivdoOY0F +PH0fSxJNLFxBM1T62k8CcTqTNwn1EchnXzs4O8ueVTkG5gfxiJzsE9fuWsJRH2k8 +356LtraGtOYOo2toh2P7tezCb1kq2LzeBisEd43xmob+Dv02gVJFowPSlNLQadZB +I8cYOCkIclePVoPslqmP5w5vivlTsqJFDMiICgIG9/MZnLzGT93cRifcjGQPFMxw +o8Mye7F1JPs3SemWi9rAJha020hBjmbJk+Q4SK7vi76Y/890UtljzSpGSkjMYtXn +yybREPeXTZXVqXwsI7hA588YW8G16nFUWxGDF3dGhybSTh+EKDBkEULmUISURUTw +pb4cwThrNgJmWcF/t90P +=vXKT -----END PGP SIGNATURE----- diff --git a/app-text/htmltidy/htmltidy-20090325-r1.ebuild b/app-text/htmltidy/htmltidy-20090325-r1.ebuild index adec4283b069..60cacf23f312 100644 --- a/app-text/htmltidy/htmltidy-20090325-r1.ebuild +++ b/app-text/htmltidy/htmltidy-20090325-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-20090325-r1.ebuild,v 1.1 2010/03/30 08:32:24 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-20090325-r1.ebuild,v 1.2 2011/09/16 18:37:08 scarabeus Exp $ -EAPI=2 -inherit eutils autotools +EAPI=4 MY_PN="tidy" -MY_P=${MY_PN}-${PV} -S="${WORKDIR}"/${MY_P} +MY_P="${MY_PN}-${PV}" + +inherit eutils autotools DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents" HOMEPAGE="http://tidy.sourceforge.net/" @@ -17,11 +17,13 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="debug doc" +IUSE="debug doc static-libs" DEPEND="doc? ( app-doc/doxygen )" RDEPEND="" +S="${WORKDIR}"/${MY_P} + src_prepare() { # Required to setup the source dist for autotools einfo "Setting up autotools for source build" @@ -45,37 +47,31 @@ src_compile() { } src_configure() { - econf $(use_enable debug) + econf \ + $(use_enable debug) \ + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "error during make install" + default + + find "${ED}" -name '*.la' -exec rm -f {} + - cd "${S}"/htmldoc - # It seems the manual page installation in the Makefile's - # is commented out, so we need to install manually - # for the moment. Please check this on updates. - # mv man_page.txt tidy.1 - # doman tidy.1 - # - # Update: # Now the man page is provided as an xsl file, which # we can't use until htmltidy is merged. # I have generated the man page and quickref which is on # the mirrors. (bug #132429) - doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1 || die "doman failed" + doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1 # Fix name before installing mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \ "${WORKDIR}"/"${MY_P}"-doc/quickref.html + cd "${S}"/htmldoc # Install basic html documentation - dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html || - die "dohtml failed" + dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html # If use 'doc' is set, then we also want to install the # api documentation - if use doc; then - dohtml -r api || die "api dohtml failed" - fi + use doc && dohtml -r api } diff --git a/app-text/htmltidy/htmltidy-20090325.ebuild b/app-text/htmltidy/htmltidy-20090325.ebuild deleted file mode 100644 index 8c6f66bc5b5a..000000000000 --- a/app-text/htmltidy/htmltidy-20090325.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-20090325.ebuild,v 1.10 2010/01/02 12:16:07 fauli Exp $ - -EAPI=2 -inherit eutils autotools - -MY_PN="tidy" -MY_P=${MY_PN}-${PV} -S="${WORKDIR}"/${MY_P} - -DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents" -HOMEPAGE="http://tidy.sourceforge.net/" -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 - mirror://gentoo/${MY_P}-doc.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="debug doc" - -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" - -src_prepare() { - # Required to setup the source dist for autotools - einfo "Setting up autotools for source build" - cp -R ./build/gnuauto/* . || die "could not prepare autotools environment" - - # Stop tidy from appending -O2 to our CFLAGS - epatch "${FILESDIR}"/htmltidy-5.10.26-strip-O2-flag.patch - - # Define /etc/tidyrc for system wide config, bug 154834 - epatch "${FILESDIR}"/htmltidy-20090325-tidyrc.patch - - eautoreconf -} - -src_compile() { - default - - if use doc ; then - doxygen htmldoc/doxygen.cfg || die "error making apidocs" - fi -} - -src_configure() { - econf $(use_enable debug) -} - -src_install() { - emake DESTDIR="${D}" install || die "error during make install" - - cd "${S}"/htmldoc - # It seems the manual page installation in the Makefile's - # is commented out, so we need to install manually - # for the moment. Please check this on updates. - # mv man_page.txt tidy.1 - # doman tidy.1 - # - # Update: - # Now the man page is provided as an xsl file, which - # we can't use until htmltidy is merged. - # I have generated the man page and quickref which is on - # the mirrors. (bug #132429) - doman "${WORKDIR}"/${MY_P}-doc/tidy.1 - - # Install basic html documentation - dohtml *.html *.css *.gif "${WORKDIR}"/${MY_P}-doc/quickref.html - - # If use 'doc' is set, then we also want to install the - # api documentation - use doc && dohtml -r api -}