From 5d4dcf63056052407eabccc26840d15d9b348bba Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Sat, 12 Jan 2013 21:45:48 +0000 Subject: Get rid of the usbredir patch since we're shipping a newer version which supports that version anyway. Package-Manager: portage-2.1.11.31/cvs/Linux x86_64 --- net-misc/spice-gtk/ChangeLog | 9 +- net-misc/spice-gtk/Manifest | 4 +- net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild | 175 ---------------------------- net-misc/spice-gtk/spice-gtk-0.14-r2.ebuild | 175 ++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 178 deletions(-) delete mode 100644 net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild create mode 100644 net-misc/spice-gtk/spice-gtk-0.14-r2.ebuild (limited to 'net-misc') diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog index 70100dc0d60a..4bd6f05e80b2 100644 --- a/net-misc/spice-gtk/ChangeLog +++ b/net-misc/spice-gtk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/spice-gtk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.45 2013/01/12 21:35:44 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.46 2013/01/12 21:45:43 cardoe Exp $ + +*spice-gtk-0.14-r2 (12 Jan 2013) + + 12 Jan 2013; Doug Goldstein -spice-gtk-0.14-r1.ebuild, + +spice-gtk-0.14-r2.ebuild: + Get rid of the usbredir patch since we're shipping a newer version which + supports that version anyway. 12 Jan 2013; Doug Goldstein spice-gtk-0.16.ebuild: Fix typo diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index adb938662e60..09b8d6cefa92 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -4,8 +4,8 @@ AUX spice.protocol 159 SHA256 9a13ea202d5b26cbb45874c56df95d30c15a9372e551404267 AUX spice.schemas 1305 SHA256 aa21d09f57e539a9206d88051f2b4d1a15e9eb3e8ea2d104bdcdcb677801ea14 SHA512 bf894c8970c92353df0849e532ac46f7e04a3344090ca70c325ea198aa1a10e94a71649f7648a867d18b07fddc2e87be67d82d332965fc5777466e4798bfa33e WHIRLPOOL 593b2c2bad2ec1c975838ac5665a143c96f04e14a9537863eedd58ee1b34653aaa538b1e1e0a81f756c32ecc5ea4b8e08a5f988ff0fc05759633f6610eb27702 DIST spice-gtk-0.14.tar.bz2 1204821 SHA256 a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5 SHA512 64510e098927d856ac8f05c6d9f07626ee280979fd792bb92f188ff11a15ff54b11acd0471a7e30c8f6fbc594a036c6642bd3369c0d231412ea9aece6d07bba1 WHIRLPOOL 16ce4c6cfb863c76026998239b5bbbd912cdeb5044afb8533020eaf255585863f41080bcc598b51efea3dc99b5e678508f1ece3f18a6dbae0d71e4bb81b513b9 DIST spice-gtk-0.16.tar.bz2 1208505 SHA256 8de079f7ca44505762b9d0c91de8203dfcc6febb12d4ea3ec614de08852e25f9 SHA512 9d12d4c3b53da8b4248000cd935cdd19d0c8cb9227146d768620105858f20f5a326a533ef451c064b98a4caae350b009b4c680b8e77cd05fa92245bcf3801c6f WHIRLPOOL 5929b0806767c775c4a4f2b63ec4c1fedd164ee392c6aa4f5287ca7ecd69c0a5420cfc27a1178759c02af637ec6325dfa76dbc4e6fe50ccf41e652fe6192368a -EBUILD spice-gtk-0.14-r1.ebuild 4332 SHA256 7da1d36626e89148c7a43a0c84d97911a60853e417e627e4caf0d5f98e120405 SHA512 1a0f1927dbb80bd066b28da4abcf17767533feebb3020f39e94b9fd2ccfca8ed4c9a4b1daf21f836840cb137e9b7232961ed9b1f3c1e00f0ca00d3e1c2435910 WHIRLPOOL 9799a2e26cb38a7386a93dace56e9802f69911fff42a525063dda239813a90d4082d5d694b7ea5dbe4bc8a7c9fcb8d39f9f0bcca395877a8fc855bd8609efc2c +EBUILD spice-gtk-0.14-r2.ebuild 4241 SHA256 ab811f7ed83b42641c072b422f11bf6d40f29a493f9a265e024455963a34a433 SHA512 3bf821ff7cdb38f5977afd27514977266146f92305ff6af48a20c86a51222d4e54d579daae297ce30d8f06895523a92dfd14ffc5417467a1f967c34e367e0338 WHIRLPOOL bafbecf7ec3f4e5fa4c9b94e756281fb23bf7f9a7307a898e83fb0800dbf830b2e1e3aa9a42e591ab3592ac32e50dad506574ec5ceacaaf07fc9cadce53f6fcf EBUILD spice-gtk-0.14.ebuild 3386 SHA256 d0aee0d2332ab77737702554f162b036dc9e955f28d722694d73762609c39367 SHA512 53724bcc86000745160e34374f26da6282104e58bd896ae9bb8727341a31b8ec06813a9bc250b34ec3353ed5359714c55f90cc9fc1e4c0af994469c96ba9b82a WHIRLPOOL cca8bcec49b5d5f400d8a6f02495b83546809a4b41fa607a381d65e916c9c809af133198e95158f32a71c86a0d7277f39b84434d3cf9593314ca0d57583c1824 EBUILD spice-gtk-0.16.ebuild 4319 SHA256 171d07f93820baa33650e41d8d07f3932c409b1d100a1e9b32d7c30de74e4dcb SHA512 ff0bbd595d5d0934f67e984172c9e1b2d0946efa35d903520c7fd0db07830247ccfd687db6c876e86c22b40b3c59e0508ee01ed8b3280c3aa83d84b09c7678d9 WHIRLPOOL 21403174497ea29f46ae5d40db1656e0bdbccdd6c4984bfdd5cba638f8e373ed847d81a31da5fc44d597bb6769a0c3044e152e9d3af3f9f58290b3c577688a3f -MISC ChangeLog 7306 SHA256 8cdeba1880cd098ccf6745b17e2d6feca34b4a06ebc3efa4bb7d8405b9dc9a0b SHA512 f222fce34ebc366a62e4304960fd81756b0ba278dc23478763c1a5c6f60cee6b50e7832a9a3e02992a6c5c31cc23d414dc487c09278c61d4eb05a0193f286de2 WHIRLPOOL 323e12ebc04100c38649d520d8d5cc4bf7ee00bfbbdfc44490628245e95f7a391e071019c646673d751ec9ea781546dc35ec0948be636b44cbe381563cfe9a45 +MISC ChangeLog 7554 SHA256 4f2aafe42d9caef49dfec937a926e78add09507e30c4c9ab6fbe8c0db091c2e4 SHA512 ca35eba35ca019db34c74e242542ba0c2c17df8fe367d354b4f16ac2c91b3e7a257ddf15dbd7eaa62703df08342fde1d7065d01a790aab3b3be813a23caa99aa WHIRLPOOL 26fb8f1ba677298347b4f65695cbc1c056db79242fde230c47d5c04040c26c1562bbbe4769756dd3d9953f3d36f9a05c4ab1f456f5e57729a2f029dad02f0ff1 MISC metadata.xml 1040 SHA256 cb0bf539a6404538e0490d66d61ed4c681cb4adeef491d29a9fc0d40aa397372 SHA512 5fd46b49634cae63efb389c4d235d236c36d364983e0534fab99a79fb9efc482f9d9f136cc53b98c129e05d5352c415949d56f7f4c090f121b6dcc034f54c344 WHIRLPOOL d08af5e61fc66f4541a65837a1f13e7164bf70552fe63ac4519deb787ff4363894a3ad29593e72eaa7642e01a156c2f4c2a73b8a2020af9e346a4467cb3a1018 diff --git a/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild deleted file mode 100644 index 77513aebe06b..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild,v 1.10 2013/01/12 21:23:16 cardoe Exp $ - -EAPI=5 -GCONF_DEBUG="no" -WANT_AUTOMAKE="1.11" - -inherit autotools eutils python - -PYTHON_DEPEND="2" - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI." -HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc gstreamer gtk3 +introspection policykit pulseaudio -python sasl smartcard static-libs usbredir vala" - -REQUIRED_USE="?? ( pulseaudio gstreamer )" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND="pulseaudio? ( media-sound/pulseaudio[glib] ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) - >=x11-libs/pixman-0.17.7 - >=media-libs/celt-0.5.1.1:0.5.1 - dev-libs/openssl - gtk3? ( x11-libs/gtk+:3[introspection?] ) - x11-libs/gtk+:2[introspection?] - >=dev-libs/glib-2.26:2 - >=x11-libs/cairo-1.2 - virtual/jpeg - sys-libs/zlib - introspection? ( dev-libs/gobject-introspection ) - python? ( dev-python/pygtk:2 ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/libcacard ) - usbredir? ( - sys-apps/hwids - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - virtual/udev[gudev] - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.101 ) - )" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.10.1 - dev-lang/python - virtual/pyparsing - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( dev-lang/vala:0.14 )" - -# Hard-deps while building from git: -# dev-lang/vala:0.14 -# dev-lang/perl -# dev-perl/Text-CSV - -GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" -GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - mkdir ${GTK2_BUILDDIR} || die - mkdir ${GTK3_BUILDDIR} || die - - epatch \ - "${FILESDIR}/0.12-parallel-install.patch" \ - "${FILESDIR}/${PV}-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch" - eautoreconf -} - -src_configure() { - local myconf - local audio="no" - - use gstreamer && audio="gstreamer" - use pulseaudio && audio="pulse" - - if use vala ; then - # force vala regen for MinGW, etc - rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c - fi - - myconf=" - $(use_enable static-libs static) \ - $(use_enable introspection) \ - --with-audio=${audio} \ - $(use_with python) \ - $(use_with sasl) \ - $(use_enable smartcard) \ - $(use_enable usbredir) \ - $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \ - $(use_with usbredir usb-acl-helper-dir /usr/libexec) \ - $(use_enable policykit polkit) \ - $(use_enable vala) \ - --disable-werror" - - cd ${GTK2_BUILDDIR} - echo "Running configure in ${GTK2_BUILDDIR}" - ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ - VALAC=$(type -P valac-0.14) \ - VAPIGEN=$(type -P vapigen-0.14) \ - --with-gtk=2.0 \ - ${myconf} - - if use gtk3; then - cd ${GTK3_BUILDDIR} - echo "Running configure in ${GTK3_BUILDDIR}" - ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ - VALAC=$(type -P valac-0.14) \ - VAPIGEN=$(type -P vapigen-0.14) \ - --with-gtk=3.0 \ - ${myconf} - fi -} - -src_compile() { - cd ${GTK2_BUILDDIR} - einfo "Running make in ${GTK2_BUILDDIR}" - default - - if use gtk3; then - cd ${GTK3_BUILDDIR} - einfo "Running make in ${GTK3_BUILDDIR}" - default - fi -} - -src_test() { - cd ${GTK2_BUILDDIR} - einfo "Running make check in ${GTK2_BUILDDIR}" - default - - if use gtk3; then - cd ${GTK3_BUILDDIR} - einfo "Running make check in ${GTK3_BUILDDIR}" - default - fi -} - -src_install() { - cd ${GTK2_BUILDDIR} - einfo "Running make check in ${GTK2_BUILDDIR}" - default - - if use gtk3; then - cd ${GTK3_BUILDDIR} - einfo "Running make install in ${GTK3_BUILDDIR}" - default - fi - - # Remove .la files if they're not needed - if ! use static-libs; then - find "${ED}" -name '*.la' -exec rm -f '{}' + || die - fi - - use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la - use doc || rm -rf "${ED}/usr/share/gtk-doc" - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" -} diff --git a/net-misc/spice-gtk/spice-gtk-0.14-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.14-r2.ebuild new file mode 100644 index 000000000000..94e0cc265972 --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.14-r2.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.14-r2.ebuild,v 1.1 2013/01/12 21:45:43 cardoe Exp $ + +EAPI=5 +GCONF_DEBUG="no" +WANT_AUTOMAKE="1.11" + +inherit autotools eutils python + +PYTHON_DEPEND="2" + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI." +HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" + +LICENSE="LGPL-2.1" +SLOT="0" +SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" +KEYWORDS="~amd64 ~x86" +IUSE="doc gstreamer gtk3 +introspection policykit pulseaudio +python sasl smartcard static-libs usbredir vala" + +REQUIRED_USE="?? ( pulseaudio gstreamer )" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND="pulseaudio? ( media-sound/pulseaudio[glib] ) + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + >=x11-libs/pixman-0.17.7 + >=media-libs/celt-0.5.1.1:0.5.1 + dev-libs/openssl + gtk3? ( x11-libs/gtk+:3[introspection?] ) + x11-libs/gtk+:2[introspection?] + >=dev-libs/glib-2.26:2 + >=x11-libs/cairo-1.2 + virtual/jpeg + sys-libs/zlib + introspection? ( dev-libs/gobject-introspection ) + python? ( dev-python/pygtk:2 ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/libcacard ) + usbredir? ( + sys-apps/hwids + >=sys-apps/usbredir-0.4.2 + =sys-auth/polkit-0.101 ) + )" +DEPEND="${RDEPEND} + >=app-emulation/spice-protocol-0.10.1 + dev-lang/python + virtual/pyparsing + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + vala? ( dev-lang/vala:0.14 )" + +# Hard-deps while building from git: +# dev-lang/vala:0.14 +# dev-lang/perl +# dev-perl/Text-CSV + +GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" +GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + mkdir ${GTK2_BUILDDIR} || die + mkdir ${GTK3_BUILDDIR} || die + + epatch \ + "${FILESDIR}/0.12-parallel-install.patch" + eautoreconf +} + +src_configure() { + local myconf + local audio="no" + + use gstreamer && audio="gstreamer" + use pulseaudio && audio="pulse" + + if use vala ; then + # force vala regen for MinGW, etc + rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c + fi + + myconf=" + $(use_enable static-libs static) \ + $(use_enable introspection) \ + --with-audio=${audio} \ + $(use_with python) \ + $(use_with sasl) \ + $(use_enable smartcard) \ + $(use_enable usbredir) \ + $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \ + $(use_with usbredir usb-acl-helper-dir /usr/libexec) \ + $(use_enable policykit polkit) \ + $(use_enable vala) \ + --disable-werror" + + cd ${GTK2_BUILDDIR} + echo "Running configure in ${GTK2_BUILDDIR}" + ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ + VALAC=$(type -P valac-0.14) \ + VAPIGEN=$(type -P vapigen-0.14) \ + --with-gtk=2.0 \ + ${myconf} + + if use gtk3; then + cd ${GTK3_BUILDDIR} + echo "Running configure in ${GTK3_BUILDDIR}" + ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ + VALAC=$(type -P valac-0.14) \ + VAPIGEN=$(type -P vapigen-0.14) \ + --with-gtk=3.0 \ + ${myconf} + fi +} + +src_compile() { + cd ${GTK2_BUILDDIR} + einfo "Running make in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make in ${GTK3_BUILDDIR}" + default + fi +} + +src_test() { + cd ${GTK2_BUILDDIR} + einfo "Running make check in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make check in ${GTK3_BUILDDIR}" + default + fi +} + +src_install() { + cd ${GTK2_BUILDDIR} + einfo "Running make check in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make install in ${GTK3_BUILDDIR}" + default + fi + + # Remove .la files if they're not needed + if ! use static-libs; then + find "${ED}" -name '*.la' -exec rm -f '{}' + || die + fi + + use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la + use doc || rm -rf "${ED}/usr/share/gtk-doc" + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" +} -- cgit v1.2.3-65-gdbad