bump to 0.47 final release, drop 47 pre-releases

Package-Manager: portage-2.2_rc51/cvs/Linux i686

6 files changed, 16 insertions, 266 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 68203ad4691c..e3a540ae34e1 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.126 2009/10/17 15:35:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.127 2009/11/25 10:25:21 maekke Exp $
+
+*inkscape-0.47 (25 Nov 2009)
+
+  25 Nov 2009; Markus Meier <maekke@gentoo.org> -inkscape-0.47_pre1.ebuild,
+  -inkscape-0.47_pre2.ebuild, -inkscape-0.47_pre3.ebuild,
+  -inkscape-0.47_pre4.ebuild, +inkscape-0.47.ebuild:
+  bump to 0.47 final release, drop 47 pre-releases
 
 *inkscape-0.47_pre4 (17 Oct 2009)
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e51aa06fa601..4de886d6cdf7 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -10,21 +10,15 @@ AUX inkscape-0.46-gcc44_p2.patch 1296 RMD160 3c3125bb92856e4f939328849dfef222a3a
 AUX inkscape-0.46-glibc2.10.patch 4634 RMD160 d63d5e29efeda9412c37890664da8b788fb8bd9c SHA1 b9078c7c7c8c6654ec646997436b3e78ffc0927e SHA256 4e966730323ef663612c22ab428b0347189812d9db012b8d702730452d5115a1
 AUX inkscape-0.46-poppler-0.8.3.patch 1571 RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c
 DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
-DIST inkscape-0.47pre1.tar.gz 22924828 RMD160 4f5c3f89643f196245620ce14f76802039574a4f SHA1 9a0026012afa8e562e545d980938d1012cd3bac0 SHA256 19eecc583deb4cbf4438a90b8f5b990f580916b05f99a348c0421cb5d048e77d
-DIST inkscape-0.47pre2.tar.gz 26464384 RMD160 b544fb77937c48c94dd20674cb91a473472e7ecc SHA1 d6bc84142d2d8276f3d1809272eeeff2be5b362a SHA256 f597eba2f20ebe5fff42fafcf774b0b607e336b4b4836a6a7af896c7784f260c
-DIST inkscape-0.47pre3.tar.gz 26821064 RMD160 86fae958f909ae75918f4d547a1080ab09fa3c39 SHA1 6111f18301b50062c51292c8c9c2ec2896feb071 SHA256 b59367192a9f8fc15938f623585436f3cf43388e3319615991cbfeb5c3ad951b
-DIST inkscape-0.47pre4.tar.gz 27295282 RMD160 243ed914d0ad7b210bb4c05a318224e68dd7550d SHA1 0340f33315a93b5ec001c62c2790726547e4dc2a SHA256 a3f79a5df9423f6b273a7d447025b7f2750e2b61ae86be96bf7a9ac664012296
+DIST inkscape-0.47.tar.gz 28044445 RMD160 58fe20b2a103bd8909e27811354e1a3700dcd177 SHA1 aa39d5f7306edb21be4987651041bf50c13baf75 SHA256 e5899be10183d86249516a29bc146706600ae5eafb5be5274c465a8029659b97
 EBUILD inkscape-0.46-r5.ebuild 2425 RMD160 84b9e051f7b12e8ceb329a4d3b04577fa9784f12 SHA1 7dfd8b737b46084597ae1c431532fe1cb152ac87 SHA256 9d3f36ca6fcf89878b7bc7587e09adb13077c2cf97c8fe2f7939b984879c4600
-EBUILD inkscape-0.47_pre1.ebuild 2313 RMD160 c24966e421113325e916fc677ba8037ab3aa1c66 SHA1 947a4a6e801d7bdbb787538bad62ff19aef554b5 SHA256 733f8673e4b05fbb9ddec67637d7ff4a5c2e3373ec5f456db74bb5d74f280abb
-EBUILD inkscape-0.47_pre2.ebuild 2313 RMD160 3d8d492452f3cf22b2adad1ff56baf066e5f7b16 SHA1 ec7c4513e74eadb76d51cf432a2b84bd6c81b58a SHA256 24593750eee6d3ab9a9cbfe05b1863bad7501767c750c7d3b062faea929fb0d2
-EBUILD inkscape-0.47_pre3.ebuild 2256 RMD160 43058d142b0a2e9598b1569a7605044fcdffcd54 SHA1 5c64414aa9d19ff6510c9ed4a0a48632a90f04c0 SHA256 7f0515c8795a4edfbd76f390592cf118aae1e2ed90d093548a06daa8a01bd28f
-EBUILD inkscape-0.47_pre4.ebuild 2255 RMD160 ddbff294333be0bff3f6eee157053d5a6d1e544e SHA1 7521aee520280e400e322b4053a2fe25f47556cf SHA256 3868022434bc3d283592d8acdfa4f5758eaad530ec635b860cd38d1e866543ed
-MISC ChangeLog 17090 RMD160 aff37ea30b4d8461fdaa1f3ee22b77e862e26207 SHA1 647f3d07120b7435f80d8bf60e28e644bc506fb4 SHA256 47a0ab9f88ed6f6321264c871f0addee63b2837d318d7515932175a41094eed0
+EBUILD inkscape-0.47.ebuild 2250 RMD160 493f9d60f8ed0b8a26c574da1640d6e921992a43 SHA1 ad4bb69e44b56d304084cb5987ed74321ccc208e SHA256 2ec2f0b74ffb45b3012bc460bb4668a0df4520cc3f1f1e46b7cb486e61528eef
+MISC ChangeLog 17359 RMD160 c3d7cbad64c578787c8fdb025afb7e0cfd77afce SHA1 99c411b3d009921da539e588da4080a0b2afcc7b SHA256 9bc2485c92ae003851b0048b6c5bf86e7620dcf9a3da43548e8f8fa0257468d6
 MISC metadata.xml 587 RMD160 9ae7571b540c5a299c5ef6839dd4306f9e5cecd6 SHA1 9e552ba112046bb8d92953ea5ace3a8355560a58 SHA256 624c3c42ea924d7f4f90c11be900d1e54be5c63cb595ae60d60f2f9f5d6e3921
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrZ5HsACgkQkKaRLQcq0GIbtgCeObGcOwaACGs2TnfI835eglgo
-kwgAnRRZNcgC0Kq7MbuJyW03GwKfo9BL
-=WETr
+iEYEARECAAYFAksNBnwACgkQkKaRLQcq0GIv2ACfZwBqCxgVYhHGaJvZuEc92ZDX
+AaMAn2V7kbGGJWEg6fGnWb43axrAoDnP
+=wt1B
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/inkscape-0.47_pre4.ebuild b/media-gfx/inkscape/inkscape-0.47.ebuild
index 8a630831641a..c9e3d7deaaba 100644
--- a/media-gfx/inkscape/inkscape-0.47_pre4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47_pre4.ebuild,v 1.1 2009/10/17 15:35:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47.ebuild,v 1.1 2009/11/25 10:25:21 maekke Exp $
 
 EAPI=2
 inherit gnome2
diff --git a/media-gfx/inkscape/inkscape-0.47_pre1.ebuild b/media-gfx/inkscape/inkscape-0.47_pre1.ebuild
deleted file mode 100644
index 61916bc7bfbf..000000000000
--- a/media-gfx/inkscape/inkscape-0.47_pre1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47_pre1.ebuild,v 1.3 2009/10/05 20:27:25 volkmar Exp $
-
-EAPI=2
-inherit gnome2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="dia gnome inkjar jabber lcms mmx nls postscript spell wmf wpg"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=virtual/poppler-glib-0.8.3[cairo]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.10.0
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.6.5
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml
-	dev-python/pyxml
-	media-gfx/imagemagick
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=media-libs/libpng-1.2
-	sci-libs/gsl
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7
-	>=x11-libs/pango-1.4.0
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	lcms? ( >=media-libs/lcms-1.14 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell
-	)
-	wpg? ( >=media-libs/libwpg-0.1 )"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/numpy
-	dia? ( app-office/dia )
-	postscript? ( >=media-gfx/pstoedit-3.44[plotutils] media-gfx/skencil )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable jabber inkboard)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable mmx)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-pkg_postinst() {
-	elog "local configurations (also includes extensions) are moved from"
-	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"
-	elog ">=media-gfx/inkscape-0.47"
-}
diff --git a/media-gfx/inkscape/inkscape-0.47_pre2.ebuild b/media-gfx/inkscape/inkscape-0.47_pre2.ebuild
deleted file mode 100644
index 7ef07c7381a9..000000000000
--- a/media-gfx/inkscape/inkscape-0.47_pre2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47_pre2.ebuild,v 1.2 2009/10/05 20:27:25 volkmar Exp $
-
-EAPI=2
-inherit gnome2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="dia gnome inkjar jabber lcms mmx nls postscript spell wmf wpg"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=virtual/poppler-glib-0.8.3[cairo]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.10.0
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.6.5
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml
-	dev-python/pyxml
-	media-gfx/imagemagick
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=media-libs/libpng-1.2
-	sci-libs/gsl
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7
-	>=x11-libs/pango-1.4.0
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	lcms? ( >=media-libs/lcms-1.14 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell
-	)
-	wpg? ( >=media-libs/libwpg-0.1 )"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/numpy
-	dia? ( app-office/dia )
-	postscript? ( >=media-gfx/pstoedit-3.44[plotutils] media-gfx/skencil )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable jabber inkboard)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable mmx)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-pkg_postinst() {
-	elog "local configurations (also includes extensions) are moved from"
-	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"
-	elog ">=media-gfx/inkscape-0.47"
-}
diff --git a/media-gfx/inkscape/inkscape-0.47_pre3.ebuild b/media-gfx/inkscape/inkscape-0.47_pre3.ebuild
deleted file mode 100644
index c2069d2d256c..000000000000
--- a/media-gfx/inkscape/inkscape-0.47_pre3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47_pre3.ebuild,v 1.2 2009/10/05 20:27:25 volkmar Exp $
-
-EAPI=2
-inherit gnome2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="dia gnome inkjar lcms mmx nls postscript spell wmf wpg"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=virtual/poppler-glib-0.8.3[cairo]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.10.0
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.6.5
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml
-	dev-python/pyxml
-	media-gfx/imagemagick
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=media-libs/libpng-1.2
-	sci-libs/gsl
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7
-	>=x11-libs/pango-1.4.0
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	lcms? ( >=media-libs/lcms-1.14 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell
-	)
-	wpg? ( >=media-libs/libwpg-0.1 )"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/numpy
-	dia? ( app-office/dia )
-	postscript? ( >=media-gfx/pstoedit-3.44[plotutils] media-gfx/skencil )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable mmx)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-pkg_postinst() {
-	elog "local configurations (also includes extensions) are moved from"
-	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"
-	elog ">=media-gfx/inkscape-0.47"
-}