diff options
author | 2012-11-30 13:14:43 -0600 | |
---|---|---|
committer | 2012-11-30 13:14:43 -0600 | |
commit | d88828a7c88dfe5094b2193e5c8388d8502534c1 (patch) | |
tree | ca4cb1534c7ace8fa22f14d202c1e9df935431b8 /dev-libs | |
parent | dev-libs/sgml-data: New Ebuild for bug bug #445376 (diff) | |
download | sunrise-d88828a7c88dfe5094b2193e5c8388d8502534c1.tar.gz sunrise-d88828a7c88dfe5094b2193e5c8388d8502534c1.tar.bz2 sunrise-d88828a7c88dfe5094b2193e5c8388d8502534c1.zip |
dev-libs/xml-core: Changed ebuild to only install library and catalog files since update-xmlcatalog conflicts with xmlcatalog provided by libxml2.
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/xml-core/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/xml-core/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/xml-core/xml-core-0.13_p2.ebuild | 71 |
3 files changed, 61 insertions, 21 deletions
diff --git a/dev-libs/xml-core/ChangeLog b/dev-libs/xml-core/ChangeLog index 8c5525b3a..edec5d176 100644 --- a/dev-libs/xml-core/ChangeLog +++ b/dev-libs/xml-core/ChangeLog @@ -1,7 +1,12 @@ -# ChangeLog for dev-util/xml-core +# ChangeLog for dev-libs/xml-core # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Nov 2012; Matthew Schultz (mschultz) <mattsch@gmail.com> + xml-core-0.13_p2.ebuild: + Changed ebuild to only install library and catalog files since + update-xmlcatalog conflicts with xmlcatalog provided by libxml2. + *xml-core-0.13_p2 (27 Nov 2012) 27 Nov 2012; Matthew Schultz (mschultz) <mattsch@gmail.com> diff --git a/dev-libs/xml-core/Manifest b/dev-libs/xml-core/Manifest index 425188923..166afa0d1 100644 --- a/dev-libs/xml-core/Manifest +++ b/dev-libs/xml-core/Manifest @@ -1,4 +1,4 @@ DIST xml-core_0.13+nmu2.tar.gz 23436 SHA256 cd3f5402265a9ab0e7e4a6efafdc5eb9cb02d33c3e75d1ff1ecb0ac0899e242b SHA512 7d5e82cfa483667ac1b0d1d9200c1886ed03d8011a80772691cd3a68976b626c83599947ea1d5c7eea2adc901bb1fd1ec22c658ba1cc0723c2bf8124b26ccde8 WHIRLPOOL 9706e01613957fc044792bf1be9599a85c6b6feb94e7953a5fe91410dfbc7b5621d28d076e993c05bde04736d79e7140b661199178ac255672316cd9b3a171b5 -EBUILD xml-core-0.13_p2.ebuild 1181 SHA256 3966cf8741c85a91fa9f9bd6b8bd723f8a2e0495fd2a93cb77f82b5ce915688e SHA512 524ddfb71f2a22318cdacbc6c013367e6232d0a320004869b700da25887ac7c29e56539df80feb1a32bb046bfe0f225103c082b5582ee36efdbb36f18b6f9540 WHIRLPOOL 392b5629f82569fccb96ef632a67f2212c6d560023b1686ab4c309463cd13c30d6667fe4346f7a079eb5398e97f8a2b45a02320aa317e5ed1aee0f26b304cf11 -MISC ChangeLog 319 SHA256 a606aebd95fb05dc52345399c64520b13f4b993ff2065fa60c485934e90dc31c SHA512 d372e1dd0f722ea2a28bc4cc1dbe1dab93dcebc879cb6e4ffe2171e1ee2faf5f3c61d3022f92d9db5cbff63c9de6e098302d637d48d6cc57d4e627e32360ef61 WHIRLPOOL 8d2d04c22fdac10bedfbda7437f128a5fd729ed1a076e789cb07d381224e71033165a375a3298972cc544caf83cf67e436ec12d1e9dd250fd1b241ccd563c1bf +EBUILD xml-core-0.13_p2.ebuild 3029 SHA256 b817e5303816e14aee2e28b990885d69312dbf2fd42c6ebe9363a794358d347e SHA512 1ae4e2e237ea421c6ee062462072733fd5da60cbbc6e812027de7af6cb5b198336977017ab2f57f548644382da76881124c30cc0ac5503250de8e6263bdd7052 WHIRLPOOL 1a774cfa45cab324f82411a01f9bf70e5b301ab15bb02480479516617dadf2de5414f4bff3fc2488edcaba088e024cef0bab9e0aa6ca06aca5ab9680b11ddcaf +MISC ChangeLog 541 SHA256 44ce517227821b90d3021e8dd340474bba1930a85300ff389152d8e43acddd4b SHA512 386d5928ad890eed650f664094dfb65d34086d038cdc3ddf951f5a95cafa61f30fe6081a9f78fbbe3d3dc3570ec5a285582c07c26376f777be82519ddae91ac8 WHIRLPOOL 5c52bb07bd2b0ba407b8912025aba9e816b25edebed749346c5082fbc0b9e3492dabf140aca805e96f1f598f01fdce4685602207c8329e98eac1660384969649 MISC metadata.xml 405 SHA256 a37fd2a3087329e0c4c23b8b78473834c3934d36da84fdd8cd73de43b9c16989 SHA512 87386e6f0303b495f36d141fcfb8d6cb6c0c857b149b6cbdeca90f9e1f84e4f245efd7ec99dde876e2cf5338db067615c56bc32441a84e25c2a222e42da5f9d6 WHIRLPOOL 6822e39614eb8b3059d6638754163bd0e83074e79eb7d7d89079704436896212f8605bf5eee7f8e2a50d4c5836b611eb2d390f72483c0a45f0a3dbffd03db2f5 diff --git a/dev-libs/xml-core/xml-core-0.13_p2.ebuild b/dev-libs/xml-core/xml-core-0.13_p2.ebuild index 80af52b5c..831e860e4 100644 --- a/dev-libs/xml-core/xml-core-0.13_p2.ebuild +++ b/dev-libs/xml-core/xml-core-0.13_p2.ebuild @@ -9,43 +9,78 @@ inherit versionator sgml-catalog MY_PV=$(replace_version_separator 2 '+') MY_PV=${MY_PV/p/nmu} -DESCRIPTION="XML infrastructure and XML catalog file support" +DESCRIPTION="XML catalog infrastructure support" HOMEPAGE="http://packages.debian.org/xml-core" SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${MY_PV}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples" +IUSE="" -DEPEND="dev-lang/perl" -RDEPEND="app-text/sgml-base - dev-util/debhelper - virtual/perl-File-Spec - virtual/perl-Getopt-Long - ${DEPEND}" +RDEPEND="dev-libs/libxml2 + dev-libs/sgml-data" S="${WORKDIR}/${PN}-${MY_PV}" sgml-catalog_cat_include "/etc/sgml/${P}.cat" \ "/usr/share/sgml/dtd/xml-core/catalog" -src_compile() { - emake prefix="${D}"/usr -} - src_install() { - emake prefix="${D}"/usr install + # Note: we don't install update-xmlcatalog or its debhelper + # because it conflicts with xmlcatalog in libxml2 and xmlcatalog + # already provides the necessary functionality + dodir /etc/sgml /etc/xml insinto /usr/share/sgml/dtd/${PN} doins schemas/{catalog,catalog.dtd} insinto /usr/share/xml/schema/${PN} doins schemas/catalog.xml - keepdir /var/lib/${PN} insinto /usr/share/lintian/overrides doins debian/lintian-overrides/xml-core - dodoc debian/{README.Debian,TODO,changelog} - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples + dodoc debian/{TODO,changelog} +} + +pkg_postinst() { + einfo "Creating package XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --create /etc/xml/${PN} + einfo "Adding entries to root XML catalog and package XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \ + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" \ + "${EPREFIX}"/etc/xml/${PN} /etc/xml/catalog + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \ + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" \ + "${EPREFIX}"/usr/share/xml/schema/xml-core/catalog.xml /etc/xml/${PN} + + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Catalogs V1.0//EN" \ + "${EPREFIX}"/etc/xml/${PN} /etc/xml/catalog + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Catalogs V1.0//EN" \ + "${EPREFIX}"/usr/share/xml/schema/xml-core/catalog.xml /etc/xml/${PN} + + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \ + "http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" \ + "${EPREFIX}"/etc/xml/${PN} /etc/xml/catalog + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \ + "http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" \ + "${EPREFIX}"/usr/share/xml/schema/xml-core/catalog.xml /etc/xml/${PN} + + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "public" \ + "-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" \ + "${EPREFIX}"/etc/xml/${PN} /etc/xml/catalog + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "public" \ + "-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" \ + "${EPREFIX}"/usr/share/xml/schema/xml-core/catalog.xml /etc/xml/${PN} + sgml-catalog_pkg_postinst +} + +pkg_postrm() { + einfo "Removing entries from the root XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --del \ + "${EPREFIX}"/etc/xml/${PN} /etc/xml/catalog + einfo "Removing the package XML catalog" + if [ -e /etc/xml/${PN} ]; then + rm /etc/xml/${PN} fi + sgml-catalog_pkg_postrm } |