From: Samuli Suominen Date: Mon, 28 Nov 2011 15:04:24 +0000 (+0000) Subject: Provide GTK+-3.0 version in SLOT="3" X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b8b4ba8c5af7ea667d622c49cf8045544d3eb2db;p=gentoo.git Provide GTK+-3.0 version in SLOT="3" Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- diff --git a/dev-libs/libappindicator/ChangeLog b/dev-libs/libappindicator/ChangeLog index 95e47b1cc783..a4b96213b78c 100644 --- a/dev-libs/libappindicator/ChangeLog +++ b/dev-libs/libappindicator/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/libappindicator # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.3 2011/11/20 12:16:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.4 2011/11/28 15:04:24 ssuominen Exp $ + +*libappindicator-0.4.1-r300 (28 Nov 2011) +*libappindicator-0.4.1-r201 (28 Nov 2011) + + 28 Nov 2011; Samuli Suominen + +libappindicator-0.4.1-r201.ebuild, +libappindicator-0.4.1-r300.ebuild, + +files/libappindicator-0.4.1-gtk.patch: + Provide GTK+-3.0 version in SLOT="3" 20 Nov 2011; Samuli Suominen metadata.xml: Move to ayatana herd. diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest index 4592f047241f..04c8a21d0629 100644 --- a/dev-libs/libappindicator/Manifest +++ b/dev-libs/libappindicator/Manifest @@ -1,19 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX libappindicator-0.4.1-gtk.patch 389 RMD160 4165173f68abbb7d1260cd6b5ee09c477a1a7cd0 SHA1 2f2c713b0d4a274fb922cf4c82d693784adb1c22 SHA256 92428cb35807666e24c49bc31dd4148b2f251252b621671e7f8894806b0379df AUX libappindicator-0.4.1-no-mono.patch 1825 RMD160 8c6cd0721350008d98e39ae84fe80a31280b56f1 SHA1 455db72c076a32064345d2ed9e179947fd23e1d9 SHA256 3db022c27b50ebb11dca64e2969a8fcfb0ec69a4f5004b6b8df0142be54722ed DIST libappindicator-0.4.1.tar.gz 515716 RMD160 c28db7cbf6eca3173d18a8728d3cf3552ab1f779 SHA1 b06a0c184415b2a1e41e504fe3b70d62e3a7fc05 SHA256 c6028e91e8f8f56dca659038a1486341191b7978ab227e5edf63d2c6e34bb7ae EBUILD libappindicator-0.4.1-r200.ebuild 1663 RMD160 906195b4cddc4fd277c8273824f0e4a560aa6140 SHA1 ed71f80a85a0fbb602b26628cf7a94a95ecf2a1b SHA256 302ff3872b0c1006467c5379a527f7d0afe10de75bca72d5d51df580cf5da2ef -MISC ChangeLog 656 RMD160 f09abce70cadb327b91a8dde68c559135372d6ca SHA1 4a6c659317f9bd36cd8ca3ba50d9cc469052f657 SHA256 d09f4cfe9d7ecc4d446d04baa3e22728bea49c066a537de4fd47214e5131c332 +EBUILD libappindicator-0.4.1-r201.ebuild 1677 RMD160 62a8f544f6e2a73be4333fc43baca167e853535e SHA1 ecdf4f023b4ab692ff8fd8f1b18887e303a2037e SHA256 78b7077ecd6b11612d10d547ab605358283cb533de83dd8081f766b050441445 +EBUILD libappindicator-0.4.1-r300.ebuild 1326 RMD160 4fdfe250fab4a09969d9d4e1c3c0c5f992e95db3 SHA1 e6286c683ed1a126e16980da01002b8f048ef667 SHA256 5a119b5653903379146ac9b55ec52940c81c29304811f4ed64bc876b145d8532 +MISC ChangeLog 951 RMD160 699ae0c86eda95125a01046b706004d0dda3e060 SHA1 92fc665061529bf52de3acd90871704511f70416 SHA256 afc50157096fa9a3ef6591562163d5efaae4652f42d712f504ef4f149e5a204f MISC metadata.xml 355 RMD160 806abd3e3e11d3eadadc0643b031bf07dc2f97ea SHA1 94b68e2d163b076e760da0d442499764e1b332cf SHA256 ebb4585edab710154f668295eee56405313f65735f621384a73bb6adb9ea26fa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOyO8+AAoJEEdUh39IaPFNSZ4H/jYGmnBH+atG7W5HVKN7d/ar -u3UyEnkA3DvtbbGJBA5o2nK4gnIw08upLcSY+ausLD0424LSye+p2bQb6FOEji0Q -gF8IRkD3q76BYL1iSV7/UVLp33ClNOZdZMXOW8u/jxBlNLMOWFuPHoMZ6K/9ZABr -/HHbskewKHp7sN3yhaoR+F6Nb7F2gy9QM6zwrOMLTg4pzFjIZvz/pw/RcmHE/JF8 -i8DJLLHFMcL9QhqbNmJtR0LJjQzfcCwaDMpq6m7jxWNxXIKav1CybhR9mWvfX9Cz -Fzk3TFR+YgrAI2I4Ly1j1b2m6siBuEbTs+lUUPF/RgVqqdoU+YxgZ4SmpspyYfY= -=fvaB +iQEcBAEBAgAGBQJO06JnAAoJEEdUh39IaPFNJ4EIAKIpErFmeE8MxkMr7vCpIeLG +WunDX3/q9YHOJIe8GdijnLGNcIEGjA7Whv5H4fTN96H1gGZbO2KeRT11CSDm6KbH +lzE1RBi1N1kf4sEYkBZSIdJWxUcUan6x0c8uXLAxl89E5pc3EQCA4CY9wej0ZV/C +Ph25puqBOilT4ZR2eHQFHLUh1Hsm2/x1zzyjAP4aFKKEjDY/222HTD4/dbaQLPGH +1EI4L7OC3GV0OhFA+509gcAItSiyhkD8EcngPtt4NZ+zXPd5p6ZBoVGG5oXEzyf4 +Oj/mRC+0wjb3qLYh57z8IysUpT0TdIvRH4dRJfZ+EaKzLUs9nlF69Wz2aec8mg0= +=8qOc -----END PGP SIGNATURE----- diff --git a/dev-libs/libappindicator/files/libappindicator-0.4.1-gtk.patch b/dev-libs/libappindicator/files/libappindicator-0.4.1-gtk.patch new file mode 100644 index 000000000000..e36391103f08 --- /dev/null +++ b/dev-libs/libappindicator/files/libappindicator-0.4.1-gtk.patch @@ -0,0 +1,16 @@ +--- src/app-indicator.c ++++ src/app-indicator.c +@@ -33,8 +33,13 @@ + + #include + #include ++#ifdef HAVE_GTK3 ++#include ++#include ++#else + #include + #include ++#endif + + #include + diff --git a/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild b/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild new file mode 100644 index 000000000000..95062a52978b --- /dev/null +++ b/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild,v 1.1 2011/11/28 15:04:24 ssuominen Exp $ + +EAPI=4 + +PYTHON_DEPEND="2:2.7" + +inherit autotools eutils python + +__vala_version=0.14 + +DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar" +HOMEPAGE="http://launchpad.net/libappindicator" +SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz" + +LICENSE="LGPL-2.1 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+introspection" + +# FIXME: Missing dev-lang/mono handling! +RDEPEND="dev-libs/dbus-glib + >=dev-libs/glib-2.26 + dev-libs/libdbusmenu[gtk,-gtk3] + >=dev-libs/libindicator-0.4 + dev-python/pygobject:2 + >=dev-python/pygtk-2.14:2 + >=x11-libs/gtk+-2.18:2 + introspection? ( >=dev-libs/gobject-introspection-0.10 )" +DEPEND="${RDEPEND} + dev-lang/vala:${__vala_version}[vapigen] + dev-util/gtk-doc-am + dev-util/pkgconfig" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + sed -i -e '/LDFLAGS/s:python2.6:python2.7:' bindings/python/Makefile.{am,in} || die + epatch "${FILESDIR}"/${P}-no-mono.patch + eautoreconf + + rm -f py-compile + ln -s $(type -P true) py-compile +} + +src_configure() { + export VALAC="$(type -P valac-${__vala_version})" + + econf \ + --disable-static \ + --with-gtk=2 +} + +src_install() { + emake -j1 DESTDIR="${D}" install + find "${ED}"usr -name '*.la' -exec rm -f {} + + + # SLOT="3" has eveything required + rm -rf "${ED}"usr/share/gtk-doc +} + +pkg_postinst() { + python_mod_optimize appindicator +} + +pkg_postrm() { + python_mod_cleanup appindicator +} diff --git a/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild b/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild new file mode 100644 index 000000000000..042765e6b355 --- /dev/null +++ b/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild,v 1.1 2011/11/28 15:04:24 ssuominen Exp $ + +EAPI=4 +inherit autotools eutils + +PN_vala_version=0.14 + +DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar" +HOMEPAGE="http://launchpad.net/libappindicator" +SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz" + +LICENSE="LGPL-2.1 LGPL-3" +SLOT="3" +KEYWORDS="~amd64 ~x86" +IUSE="+introspection" + +# FIXME: Missing dev-lang/mono handling! +RDEPEND="dev-libs/dbus-glib + >=dev-libs/glib-2.26 + dev-libs/libdbusmenu[gtk,gtk3] + >=dev-libs/libindicator-0.4:3 + x11-libs/gtk+:3 + introspection? ( >=dev-libs/gobject-introspection-0.10 )" +DEPEND="${RDEPEND} + dev-lang/vala:${PN_vala_version}[vapigen] + dev-util/gtk-doc-am + dev-util/pkgconfig" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-no-mono.patch \ + "${FILESDIR}"/${P}-gtk.patch + + eautoreconf +} + +src_configure() { + export VALAC="$(type -P valac-${PN_vala_version})" + + econf \ + --disable-static \ + --with-html-dir=/usr/share/doc/${PF}/html \ + --with-gtk=3 +} + +src_install() { + emake -j1 DESTDIR="${D}" install + dodoc AUTHORS ChangeLog + + find "${ED}"usr -name '*.la' -exec rm -f {} + +}