From: Pacho Ramos Date: Mon, 26 Sep 2011 11:35:33 +0000 (+0000) Subject: Handle introspection USE flag properly (bug #383635 by optiluca and fix by Alexandre... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bdbbaa580973cf2ce6587c8493659577047f97f8;p=gentoo.git Handle introspection USE flag properly (bug #383635 by optiluca and fix by Alexandre Rostovtsev), remove old. Package-Manager: portage-2.1.10.19/cvs/Linux x86_64 --- diff --git a/dev-libs/gdl/ChangeLog b/dev-libs/gdl/ChangeLog index a15c75ba8aeb..e47ee80fea8b 100644 --- a/dev-libs/gdl/ChangeLog +++ b/dev-libs/gdl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/gdl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/ChangeLog,v 1.64 2011/07/24 14:05:31 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/ChangeLog,v 1.65 2011/09/26 11:35:33 pacho Exp $ + + 26 Sep 2011; Pacho Ramos -gdl-3.0.0.ebuild, + -gdl-3.0.1.ebuild, gdl-3.0.2.ebuild: + Handle introspection USE flag properly (bug #383635 by optiluca and fix by + Alexandre Rostovtsev), remove old. *gdl-3.0.2 (24 Jul 2011) diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest index d94a9d0bdae8..a2e4e9401168 100644 --- a/dev-libs/gdl/Manifest +++ b/dev-libs/gdl/Manifest @@ -2,19 +2,15 @@ Hash: SHA1 DIST gdl-2.30.1.tar.bz2 569211 RMD160 56cdb623c627504bceaffba91d338cae5bbe2955 SHA1 c3b3e288fb84ddd9b81d8cae41699ec0828f689f SHA256 027dd1cd0191996fe1a0dc902da857698cc79564cb057ba13b09097e56e30cc1 -DIST gdl-3.0.0.tar.bz2 585811 RMD160 76a978bb405c859bf3f25179affcfa0a348c1928 SHA1 07270f1e16ad626e4d8bf793b85fc48f1f7da897 SHA256 2b84b1ff4d798920ff04ba1f89f2e20468d706d9f4aab19d03241f32b16bec96 -DIST gdl-3.0.1.tar.bz2 615616 RMD160 d7d7c6a0428adc52f7ca472ee79521db6391762c SHA1 62efcc3bc9260391734a94e53a64be78c489e83f SHA256 e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09 DIST gdl-3.0.2.tar.bz2 606979 RMD160 36caf90a3ac85fcb5460e73087b8c6a25007e3cc SHA1 3f4cd04092b6618722645c35fdaa8157d6250141 SHA256 b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308 EBUILD gdl-2.30.1.ebuild 758 RMD160 544d8385936ac93cb3d517841c72e70aad0ae7ab SHA1 43bb395087e75e460cae1568bdf03fcbf4ca59c2 SHA256 e4061fd96670bb1a7d2df763e55525aba6b61a367180c7aac9add165bcfdede1 -EBUILD gdl-3.0.0.ebuild 811 RMD160 94a43db880d7508ccb27af7a96a7bc0aec615b18 SHA1 f632790168c63478ce15bd04c5fade344754bdec SHA256 b82622882655812ad41529cbe3fbbfe5fe54e3d07b0292fdf6cda04d2a9df89a -EBUILD gdl-3.0.1.ebuild 822 RMD160 917d3f9a6368222fd1b2ac112401c7432f49da8b SHA1 f6da313030bd17942fb8d2c9ad51273577e58eb0 SHA256 bbb64c35da9d445e0e81f0bd66e45eeaaf1a6f7885775288bf17f32f0db69b8d -EBUILD gdl-3.0.2.ebuild 844 RMD160 87a605d9678057ce6bd6ec46245d64eee8fa1e5e SHA1 c50a4046acad2b98179f426c5986fb507fcbfd55 SHA256 f42f7ece4c5e98553bc27f7465ff9eb996f6c8b38be89bd7042425519581ad61 -MISC ChangeLog 8154 RMD160 228ab64619c2a28e40815a2d92cc5453dbb4ff4a SHA1 74f44a357fadb22dfe1f079e1b1af99d48226f46 SHA256 e7eecf040098dd36058612f47e3db9c73314c97f12833a674a2e6deb5f08f83e +EBUILD gdl-3.0.2.ebuild 911 RMD160 1f1f88a9eed9840f8a0702cb50c153ca7529a94e SHA1 4cbebd699ff3927b2bf3d93bb196de43b2000fe0 SHA256 5967ea627fdaee7906cad9392daf875a9975d77c5826fdbbc376a0831f6cf323 +MISC ChangeLog 8375 RMD160 8b6668433bc9c665ad3cdc0b4f444d848586d7c9 SHA1 f1d4d5211ee578ba0f17d84f47cce6e09e087e7f SHA256 4530cf7fd6af4b2b5435d8f09fb674bfc0532f814a50a912447ee9908061475c MISC metadata.xml 275 RMD160 d198c939ae6264af123154814d7862c93e21f4de SHA1 3a1da363677fe7793a7d6b99de721b87283d174a SHA256 b686b26b3537ca6aabcea923eeb34db08cae5f75a0f2559e381c88e02e6fab5f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4sJrEACgkQ1fmVwcYIWAYUNACeIa0mPQf803pRf3HY/TkZYII1 -yG4AoNoJS6W/WUm3qalDukHdTSjiqS1k -=TeK9 +iEYEARECAAYFAk6AY4oACgkQCaWpQKGI+9SQIgCeMmu0Aq6SPcOh1YfvBpZLjKIY +opIAmwbm/++gmhOx+fG8QjWEUdxnA3lZ +=zEjB -----END PGP SIGNATURE----- diff --git a/dev-libs/gdl/gdl-3.0.0.ebuild b/dev-libs/gdl/gdl-3.0.0.ebuild deleted file mode 100644 index 2e1a1c5c8be2..000000000000 --- a/dev-libs/gdl/gdl-3.0.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-3.0.0.ebuild,v 1.2 2011/04/29 00:58:33 jer Exp $ - -EAPI="3" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 - -DESCRIPTION="The Gnome Devtool Libraries" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2.1" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="doc +introspection" - -RDEPEND="dev-libs/glib:2 - >=x11-libs/gtk+-3.0.0:3[introspection?] - >=dev-libs/libxml2-2.4:2 - introspection? ( >=dev-libs/gobject-introspection-0.6.7 )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/gettext-0.17 - >=dev-util/intltool-0.40.1 - doc? ( >=dev-util/gtk-doc-1.4 )" - -DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" diff --git a/dev-libs/gdl/gdl-3.0.1.ebuild b/dev-libs/gdl/gdl-3.0.1.ebuild deleted file mode 100644 index b26e1693b6fc..000000000000 --- a/dev-libs/gdl/gdl-3.0.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-3.0.1.ebuild,v 1.2 2011/07/11 15:40:59 mattst88 Exp $ - -EAPI="3" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 - -DESCRIPTION="The Gnome Devtool Libraries" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2.1" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="doc +introspection" - -RDEPEND="dev-libs/glib:2 - >=x11-libs/gtk+-3.0.0:3[introspection?] - >=dev-libs/libxml2-2.4:2 - introspection? ( >=dev-libs/gobject-introspection-0.6.7 )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=sys-devel/gettext-0.17 - >=dev-util/intltool-0.40.1 - doc? ( >=dev-util/gtk-doc-1.4 )" - -DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" diff --git a/dev-libs/gdl/gdl-3.0.2.ebuild b/dev-libs/gdl/gdl-3.0.2.ebuild index 25dc351ba79a..772126e2ad6c 100644 --- a/dev-libs/gdl/gdl-3.0.2.ebuild +++ b/dev-libs/gdl/gdl-3.0.2.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-libs/gdl/gdl-3.0.2.ebuild,v 1.1 2011/07/24 14:05:31 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-3.0.2.ebuild,v 1.2 2011/09/26 11:35:33 pacho Exp $ EAPI="4" GCONF_DEBUG="no" @@ -27,4 +27,7 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40.1 doc? ( >=dev-util/gtk-doc-1.4 )" -DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" +pkg_setup() { + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" + G2CONF="${G2CONF} $(use_enable introspection)" +}