Punt overshadowed versions.

Package-Manager: portage-2.2.0_alpha52/cvs/Linux x86_64

diff --git a/app-text/libwpg/ChangeLog b/app-text/libwpg/ChangeLog
index 432ae748e242df75b02124e472993776601a1008..b2cc6013290e3bc82ca42cc81d4a7c4cd6e3dc7e 100644 (file)
--- a/app-text/libwpg/ChangeLog
+++ b/app-text/libwpg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/libwpg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpg/ChangeLog,v 1.2 2011/08/10 09:37:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpg/ChangeLog,v 1.3 2011/09/03 09:59:07 scarabeus Exp $
+
+  03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libwpg-0.1.3-r1.ebuild,
+  -libwpg-0.2.0.ebuild:
+  Punt overshadowed versions.
 
   10 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Add openoffice herd here too.

diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
index a786a65bed8e3f08b4d3cf405ecff2aab5f438b8..fe55fbd3f34c837a82c5382ea999180a1d64d6dc 100644 (file)
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@@ -3,17 +3,25 @@ Hash: SHA1
 
 DIST libwpg-0.1.3.tar.bz2 285550 RMD160 b4a51403491dcc5679c99b3b82737892648ca054 SHA1 1ab29ea5b7f01e8fb351361ed5e9e800321b67d3 SHA256 47f5c8d31e1b18d8f3b73a3dbbf78b6a2c4230b00f0be56e3547c56a867fd520
 DIST libwpg-0.2.0.tar.bz2 326684 RMD160 0169a85c75040dd96b03702c5d2cd67dfded6d1f SHA1 34a692566bda66488f83c635774d1bd92cee0fdf SHA256 d823f4b2ddfe349cca09e40bd57af8220e8bf935bcfb66be520e02ba4d327dc6
-EBUILD libwpg-0.1.3-r1.ebuild 1634 RMD160 e3573ba7a1b3c26d8d7b93358eecc95468c49838 SHA1 4a042ef1e296bd2c758721331aa44e3c7ea4137d SHA256 4bdf52eb055570adc75a13b512dac478bee26b06ce0b938e656f22e81c876f0f
 EBUILD libwpg-0.1.3-r2.ebuild 1682 RMD160 a02b85c6b35fc9f287da095663e423ea8e4e5cc6 SHA1 aec58ab50a1b53a46b5b489a878920c5aa609423 SHA256 eacea7838d647896712ed1d0320576f43a360bdb8769388679b146637b986daa
 EBUILD libwpg-0.1.3.ebuild 826 RMD160 1d6d30b7de85c4b3ae401991e4b6f05c71ac1f9f SHA1 8ac05089b1f87cc794840d938fca7322ece7a7b0 SHA256 dc7180fb2364a60c03cd5948d88dee565be59d65d0c8ef1f1ec69642b3a03179
 EBUILD libwpg-0.2.0-r1.ebuild 1690 RMD160 bcefbe3173a5f4a2be09bba7a53d9712598680f3 SHA1 3e3656e5b958dc52cd547e74f8f54b1ec7ad6cad SHA256 807e3008a196c1b6758fce33d9ed995bad278437a62bc7b7331a23bad33025dd
-EBUILD libwpg-0.2.0.ebuild 1639 RMD160 eed48bf515528ed8b944bae2a80a7fe430f89cfd SHA1 ac8228f19750e6d52f5bcd70267615724dbf5888 SHA256 ede8617343947ca4162d06de2d8a2885a6f4ab86d1ffeab253d73f9e1bb55c43
-MISC ChangeLog 2900 RMD160 dbba6f520c7e2dd64bdd894bb73a185c5e1d0d34 SHA1 5f1838d01611fcf4e3bfce6bb0e5147fc1249d4e SHA256 090c62b8bd24ff4ba03c5c0679937637fa7709c0a0a8a4660c35177ab2c94510
+MISC ChangeLog 3035 RMD160 bb625f0983e5675a5a340d70de31e1d7bd44b6b0 SHA1 1bad72b56b0907b633a195b4476b1f8d6fd33034 SHA256 11fc1dddd2c3aa13afe1fb084f8b0324ab4ecdf94ef5d70b9f1ba4fad74b8129
 MISC metadata.xml 246 RMD160 b2d14aff9d2355527db20c21efae3ce5b12c4b65 SHA1 cdc663748af46ff236e12a6ec2c4572674090b9b SHA256 4eb49e113c3e9b6fb095593f46a4a0da6b86dce44a8aa11e153b5d6c75bd4310
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5CUV8ACgkQHB6c3gNBRYfXDQCgpIj7zXRrlaiV2T8or7efyfDh
-wpYAnRtzI/pH/66iNnAsrDuPbpsKS190
-=Bix8
+iQIcBAEBAgAGBQJOYfp3AAoJEOSiRoyO7jvow28P/j1yuDX8leajNr0Epa87cUTR
+MSxmetousb7Ett4z9UelR97sIMye5zPLyzE1YD0rULxgbYjtjvITgxlI6TlHp5vo
+tUBc86yrrVMLhpWspOKYfYpmrA95V66mn4TowGPCU62Ogp8loWuVmR8GafvJaUMs
+daGfidkjJCwwQZWZ8jNxiybwC0tVZ75XDZdomkjnRkibP1rocXtKpTyVswWZJKOb
+9cRYW5lefTmIdfI3m3lYb4xmo7rgxSvCuFcwLVVAzE0uQNgNBWP5ZrM5vMounsm7
+NMkQ26dgSlqlMyVF7rdpfAs5AcTV8GALvgLqfDiODsbJSXNc3GvA+2trU02+Je5t
+PTQMlT2wRFFa7pW9+rL2gS5TkHNTka1bpomHTLRm2g4/Myk7dqrNKAa6678zXFu5
+N7b6Ahuufxp1XRragWnAoVT4lKKZE51gQE+O3nL0PZ6i8cWanZR79xkR9pgYjyMw
+BUKJ0wQhLn0Bupz/OqTEpi1B0h+zyuJR5a6uwSo8vTyXh0U4JhR/YdgWflZOqaIV
+DYdRFGW+Tt0bAlS6+Ll22TNLlGoqeSERQP5MnE9nfLPWxuHG9AIKsPA3614zYrpn
+yiXvLSZsgZTJl3kcmN978upjTehHl/GVMFauAQ+C8hIhCpxC/utxe513QgV/1LHg
+OQEG1KUcIZCHOSLyjKdp
+=Y/KZ
 -----END PGP SIGNATURE-----

diff --git a/app-text/libwpg/libwpg-0.1.3-r1.ebuild b/app-text/libwpg/libwpg-0.1.3-r1.ebuild
deleted file mode 100644 (file)
index b519331..0000000
--- a/app-text/libwpg/libwpg-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpg/libwpg-0.1.3-r1.ebuild,v 1.1 2011/08/04 16:25:30 scarabeus Exp $
-
-EAPI="4"
-
-inherit alternatives
-
-DESCRIPTION="C++ library to read and parse graphics in WPG"
-HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc tools"
-
-RDEPEND="app-text/libwpd:0.8[tools?]"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       doc? ( app-doc/doxygen )"
-
-src_configure() {
-       econf \
-               --program-suffix=-${SLOT} \
-               --disable-dependency-tracking \
-               $(use_with doc docs) \
-               $(use_with tools stream)
-}
-
-src_install() {
-       default
-       # Uses a binary that is conditionaly distributed
-       use tools || rm "${ED}"/usr/bin/wpg2svgbatch.pl-${SLOT}
-       find "${ED}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-       if use tools; then
-               alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-               alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-               alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
-       fi
-}
-
-pkg_postrm() {
-       if use tools; then
-               alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-               alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-               alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
-       fi
-}

diff --git a/app-text/libwpg/libwpg-0.2.0.ebuild b/app-text/libwpg/libwpg-0.2.0.ebuild
deleted file mode 100644 (file)
index c7b430e..0000000
--- a/app-text/libwpg/libwpg-0.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpg/libwpg-0.2.0.ebuild,v 1.1 2011/08/04 16:25:30 scarabeus Exp $
-
-EAPI="4"
-
-inherit alternatives autotools
-
-DESCRIPTION="C++ library to read and parse graphics in WPG"
-HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="app-text/libwpd:0.9[tools]"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
-       !<app-text/libwpd-0.1.3-r1"
-
-src_prepare() {
-       sed -i -e 's: -Werror::g' configure.in || die
-       # FIXME: Touching configure.in triggers maintainer-mode always
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               --program-suffix=-${SLOT} \
-               --disable-dependency-tracking \
-               $(use_with doc docs)
-}
-
-src_install() {
-       default
-       find "${ED}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-       alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-       alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-       alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"       fi
-}
-
-pkg_postrm() {
-       alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-       alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-       alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
-}