diff options
author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-11-08 11:53:55 +0100 |
---|---|---|
committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-11-08 12:00:14 +0100 |
commit | 8d550006a3f5196ca7acf487942ddc19fe3757c8 (patch) | |
tree | 9bfc0ec6aacf0d9decda0cc2cc18ef1433876494 | |
parent | missing patch (diff) | |
download | keruspe-8d550006a3f5196ca7acf487942ddc19fe3757c8.tar.gz keruspe-8d550006a3f5196ca7acf487942ddc19fe3757c8.tar.bz2 keruspe-8d550006a3f5196ca7acf487942ddc19fe3757c8.zip |
update moar stuff
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-rw-r--r-- | net-im/empathy/Manifest | 2 | ||||
-rw-r--r-- | net-im/empathy/empathy-9999-r1.ebuild | 54 | ||||
-rw-r--r-- | net-im/telepathy-mission-control/Manifest | 2 | ||||
-rw-r--r-- | net-im/telepathy-mission-control/telepathy-mission-control-5.9.3.ebuild | 4 | ||||
-rw-r--r-- | net-libs/gtk-vnc/Manifest | 2 | ||||
-rw-r--r-- | net-libs/gtk-vnc/gtk-vnc-9999.ebuild | 4 | ||||
-rw-r--r-- | net-libs/telepathy-glib/Manifest | 2 | ||||
-rw-r--r-- | net-libs/telepathy-glib/telepathy-glib-9999.ebuild | 11 | ||||
-rw-r--r-- | net-misc/networkmanager/Manifest | 2 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-9999.ebuild | 20 | ||||
-rw-r--r-- | net-voip/telepathy-salut/Manifest | 2 | ||||
-rw-r--r-- | net-voip/telepathy-salut/telepathy-salut-9999.ebuild | 11 | ||||
-rw-r--r-- | sys-apps/baselayout/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-2.1-r1.ebuild | 20 | ||||
-rw-r--r-- | x11-libs/libcryptui/Manifest | 2 | ||||
-rw-r--r-- | x11-libs/libcryptui/libcryptui-9999-r1.ebuild | 6 | ||||
-rw-r--r-- | x11-misc/colord/Manifest | 1 | ||||
-rw-r--r-- | x11-misc/colord/colord-9999-r1.ebuild | 75 |
18 files changed, 91 insertions, 131 deletions
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest index ed66a2ff..86e117b5 100644 --- a/net-im/empathy/Manifest +++ b/net-im/empathy/Manifest @@ -1 +1 @@ -EBUILD empathy-9999-r1.ebuild 3018 RMD160 41bf2e751295f068657c3b1a649ad48ba03bc19f SHA1 0e3454a8b5c88dde3b007f5cff48dd05ce7a6183 SHA256 4e38adb0d7d49a66b9c0a7d456a7139fc7843a5cc6c666567c13bd2584646dbe +EBUILD empathy-9999-r1.ebuild 3390 RMD160 3f020ab345ee4a6ea9a37d70a7158cb1eb176d8d SHA1 9cfe7d7279ef8d4537630469ffd73f307e1604ff SHA256 82499e5484b098ee7f7060906ae6f0143718cbb663f3dd338fc3b9ac67785b4c diff --git a/net-im/empathy/empathy-9999-r1.ebuild b/net-im/empathy/empathy-9999-r1.ebuild index 5b86c8ba..6f46c7db 100644 --- a/net-im/empathy/empathy-9999-r1.ebuild +++ b/net-im/empathy/empathy-9999-r1.ebuild @@ -2,12 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI="4" +GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" PYTHON_DEPEND="2:2.4" EGIT_HAS_SUBMODULES="yes" -inherit eutils gnome2-live multilib python +inherit gnome2-live python DESCRIPTION="Telepathy client and library using GTK+" HOMEPAGE="http://live.gnome.org/Empathy" @@ -15,50 +16,60 @@ HOMEPAGE="http://live.gnome.org/Empathy" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="eds +map +geoloc +networkmanager sendto spell test +video webkit" +IUSE="+call debug eds +map +geoloc +gnome-online-accounts +networkmanager sendto spell test +v4l" +# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good +# eventually at which point the dep can be dropped +# libgee extensively used in libempathy +# gdk-pixbuf and pango extensively used in libempathy-gtk RDEPEND=">=dev-libs/glib-2.28:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0.2:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 - >=dev-libs/folks-0.6.0 - dev-libs/libgee + >=dev-libs/folks-0.6.2 + dev-libs/libgee:0 gnome-base/gcr >=gnome-base/gnome-keyring-2.91.4-r300 >=media-libs/libcanberra-0.25[gtk3] media-sound/pulseaudio[glib] >=net-libs/gnutls-2.8.5 - >=net-libs/telepathy-glib-0.16 + >=net-libs/telepathy-glib-0.16.0 + >=net-libs/webkit-gtk-1.5.2:3 >=x11-libs/libnotify-0.7 dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas - media-libs/clutter:1.0 - media-libs/clutter-gst:1.0 - >=media-libs/gstreamer-0.10.32:0.10 + media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-bad >=net-im/telepathy-logger-0.2.10 net-libs/farsight2 >=net-libs/telepathy-farsight-0.0.14 - net-libs/telepathy-farstream net-voip/telepathy-connection-managers x11-libs/libX11 + call? ( + >=media-libs/clutter-1.7.14:1.0 + >=media-libs/clutter-gtk-0.90.3:1.0 + media-libs/clutter-gst:1.0 + net-libs/telepathy-farstream ) eds? ( >=gnome-extra/evolution-data-server-1.2 ) geoloc? ( >=app-misc/geoclue-0.11 ) - map? ( media-libs/libchamplain:0.12[gtk] - >=media-libs/clutter-gtk-0.90.3:1.0 ) + gnome-online-accounts? ( net-libs/gnome-online-accounts ) + map? ( + >=media-libs/clutter-1.7.14:1.0 + >=media-libs/clutter-gtk-0.90.3:1.0 + media-libs/libchamplain:0.12[gtk] ) networkmanager? ( >=net-misc/networkmanager-0.7 ) sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) - video? ( + v4l? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) + media-plugins/gst-plugins-v4l2:0.10 >=media-video/cheese-2.91.91.1 ) - webkit? ( >=net-libs/webkit-gtk-1.5.2:3 ) " DEPEND="${RDEPEND} app-text/scrollkeeper @@ -75,28 +86,27 @@ PDEPEND=">=net-im/telepathy-mission-control-5.7.6" pkg_setup() { DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" - # TODO: Re-add location support G2CONF="${G2CONF} --disable-coding-style-checks --disable-schemas-compile --disable-static --disable-meego --disable-Werror - --enable-call - --disable-control-center-embedding + $(use_enable call) $(use_enable debug) $(use_with eds) $(use_enable geoloc location) + $(use_enable gnome-online-accounts goa) $(use_enable map) $(use_with networkmanager connectivity nm) $(use_enable sendto nautilus-sendto) $(use_enable spell) - $(use_enable webkit) - $(use_with video cheese) - $(use_enable video gudev)" + $(use_with v4l cheese) + $(use_enable v4l gudev)" - # Build time python tools needs python2 + # Build time python tools need python2 python_set_active_version 2 + python_pkg_setup } src_prepare() { @@ -110,7 +120,7 @@ src_prepare() { src_test() { unset DBUS_SESSION_BUS_ADDRESS - emake check || die "emake check failed." + emake check } pkg_postinst() { diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest index 95a53764..fda9ac6d 100644 --- a/net-im/telepathy-mission-control/Manifest +++ b/net-im/telepathy-mission-control/Manifest @@ -1,2 +1,2 @@ DIST telepathy-mission-control-5.9.3.tar.gz 991250 RMD160 b66698ea30237f40a5bef46ee70eb7ce2045158d SHA1 c19b21229e3d79adf34f94047113175b0675f4f9 SHA256 774af104627513e7881fa6695912c962ddedcc7628ec859e020fa30000e32cab -EBUILD telepathy-mission-control-5.9.3.ebuild 1431 RMD160 59b9f6ec22f986b9a4deca272dedd9d682b5700a SHA1 08d9d095c9709b9e90aaaaad5c77122c41251320 SHA256 f849c97bdbea8dc81c1f7824305eae5fce26a3d109fda945d1bba917ff172282 +EBUILD telepathy-mission-control-5.9.3.ebuild 1308 RMD160 009d3fb9c7c37a403da9ca236bbe8e04f7c946bc SHA1 323cb1962abe5ebec9cf51329fa5c13212d4ad16 SHA256 f88cb7c5106cf2e4d2557083dbdbbf4132236febb7a1da13146795e70c155ec1 diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.9.3.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.9.3.ebuild index 72fc4df5..0f057666 100644 --- a/net-im/telepathy-mission-control/telepathy-mission-control-5.9.3.ebuild +++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.9.3.ebuild @@ -18,9 +18,7 @@ IUSE="gnome-keyring networkmanager test upower" RDEPEND=">=net-libs/telepathy-glib-0.13.14 >=dev-libs/dbus-glib-0.82 - gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) - networkmanager? ( >=net-misc/networkmanager-0.7.0 ) - upower? ( sys-power/upower )" + gnome-keyring? ( gnome-base/libgnome-keyring )" DEPEND="${RDEPEND} dev-util/pkgconfig dev-libs/libxslt diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest index 23b3de3c..b9cb3722 100644 --- a/net-libs/gtk-vnc/Manifest +++ b/net-libs/gtk-vnc/Manifest @@ -1 +1 @@ -EBUILD gtk-vnc-9999.ebuild 1466 RMD160 83942d071149546a7607bae41565257877a27fc8 SHA1 51d30f3f3ff3a419ae018591fe88857aa8d82dce SHA256 78d5956526d624a7effc3fc43ab0bc2691e73853b058519317a128c67d02530e +EBUILD gtk-vnc-9999.ebuild 1589 RMD160 89b4edf2602ee714a59fbe2bdc1c596bb3ff3ad9 SHA1 1e1326aa8e4f5fc1bb6b9bc2bb3606f882f4bfd5 SHA256 95e3feed8df29ef99a5fece6dbef4935d41bd0e7a4499b399b732d6f54197cf3 diff --git a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild index 755ff2d7..0acd3e24 100644 --- a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild +++ b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild @@ -14,6 +14,9 @@ SLOT="0" KEYWORDS="" IUSE="examples +gtk3 +introspection python sasl" +# libview is used in examples/gvncviewer -- no need +# TODO: review nsplugin when it will be considered less experimental + COMMON_DEPEND=">=dev-libs/glib-2.10:2 >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 @@ -60,6 +63,7 @@ src_install() { dodoc AUTHORS NEWS README || die gnome2_src_install python_clean_installation_image + # Remove .la files find "${ED}" -name '*.la' -exec rm -f '{}' + || die } diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest index bcc138aa..e86c337a 100644 --- a/net-libs/telepathy-glib/Manifest +++ b/net-libs/telepathy-glib/Manifest @@ -1 +1 @@ -EBUILD telepathy-glib-9999.ebuild 1554 RMD160 6cd8c428c343384e83e0585766511991be49e563 SHA1 4f5d8191a3e0113080dd5f3b0b1a717121f6cf4c SHA256 ccc8b2d24c808372eaac8c3e383cc1c8aa9dd74fa041f764ac7611885cbdc4af +EBUILD telepathy-glib-9999.ebuild 1535 RMD160 ebab7ba29d2ea69e266fa601739d711e096e454f SHA1 1d1d7ec32b7e162f7d110a2c59d7a7ed63a37376 SHA256 8b6ed595a8171502068e19e2c2a7776310fab0c4a5cf62d7a8442bbfd2c54830 diff --git a/net-libs/telepathy-glib/telepathy-glib-9999.ebuild b/net-libs/telepathy-glib/telepathy-glib-9999.ebuild index 741d8c81..ad46e349 100644 --- a/net-libs/telepathy-glib/telepathy-glib-9999.ebuild +++ b/net-libs/telepathy-glib/telepathy-glib-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI="4" PYTHON_DEPEND="2:2.5" inherit git-2 autotools python virtualx @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="" IUSE="debug +introspection +vala" -RDEPEND=">=dev-libs/glib-2.28:2 +RDEPEND=">=dev-libs/glib-2.28.0:2 >=dev-libs/dbus-glib-0.82 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) vala? ( @@ -56,13 +56,14 @@ src_configure() { } src_test() { + unset DBUS_SESSION_BUS_ADDRESS # Needs dbus for tests (auto-launched) Xemake -j1 check || die } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed" + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog NEWS README - find "${ED}" -name '*.la' -exec rm -f '{}' + || die + find "${D}" -name '*.la' -exec rm -f '{}' + || die } diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index f7c61f10..1e5d6698 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,3 +1,3 @@ AUX networkmanager-0.9_rc3-fix-tests.patch 589 RMD160 a63f0d4f908a32356baf78c7e7c9a68cd9e4d68c SHA1 9f1ed4418b124bae89f9849ce2560dd713565abc SHA256 c03a97751762864dc4dcfa6d9eeee1ea70b986bcd5830a6777cd7514ba647540 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f -EBUILD networkmanager-9999.ebuild 3837 RMD160 bcbc058c98132e91b1f7167b98a73255d97e297b SHA1 3f8bf0a788dc15d6e2b56136c9ad4cf52620c67d SHA256 57ab8b96ab95358479f43e297e65c4de13bc0d4e687fa2aa16425af86e9aa9bc +EBUILD networkmanager-9999.ebuild 4443 RMD160 4fc2586aa8179fce4bb99b4dfadbb1e799fe5cfd SHA1 a4e0eab741d8dbbafa1ca3b8d68c8c5ccb0ceeab SHA256 7bb7715f70ceddf9d0c217a52206af5e3283b5279fa8e50dd08cfed65b0ba2b3 diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild index c0bea968..070578de 100644 --- a/net-misc/networkmanager/networkmanager-9999.ebuild +++ b/net-misc/networkmanager/networkmanager-9999.ebuild @@ -5,7 +5,7 @@ EAPI="4" GNOME_ORG_MODULE="NetworkManager" -inherit autotools eutils git-2 linux-info systemd +inherit eutils gnome2-live linux-info systemd DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" @@ -24,6 +24,8 @@ REQUIRED_USE=" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +# libnl:1.1 is needed for linking to net-wireless/wimax libraries +# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 ! # TODO: Qt support? COMMON_DEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 @@ -31,7 +33,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.2 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 - >=dev-libs/libnl-1.1 + dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) @@ -86,6 +88,10 @@ pkg_pretend() { fi } +pkg_setup() { + enewgroup plugdev +} + src_prepare() { # Don't build tests epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch" @@ -133,9 +139,19 @@ src_install() { # Add keyfile plugin support keepdir /etc/NetworkManager/system-connections + chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765 insinto /etc/NetworkManager newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf + # Allow users in plugdev group to modify system connections + insinto /etc/polkit-1/localauthority/10-vendor.d + doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla" + # Remove useless .la files find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" } + +pkg_postinst() { + elog "To modify system network connections without needing to enter the" + elog "root password, add your user account to the 'plugdev' group." +} diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest index 835dca85..4f354fb8 100644 --- a/net-voip/telepathy-salut/Manifest +++ b/net-voip/telepathy-salut/Manifest @@ -1 +1 @@ -EBUILD telepathy-salut-9999.ebuild 1138 RMD160 10fe7ff09ca65a82a6384187033377ea77c3909e SHA1 9a193a8a0c532c0dc6143541087c5745407199d6 SHA256 8ee676e6ce0874179c70b61a427f94242f97990e1fec6804baf6307db0927e66 +EBUILD telepathy-salut-9999.ebuild 1235 RMD160 edc02f5d97e1eeb044c1a556d68e59fd702dea73 SHA1 fdee178c097bdd04be48072495d2098b037c3ecd SHA256 3351c33acac968111f820de20f4281b7e18550ee7e8a9e780285fdea9882aa21 diff --git a/net-voip/telepathy-salut/telepathy-salut-9999.ebuild b/net-voip/telepathy-salut/telepathy-salut-9999.ebuild index a6dc1b77..a2371ecc 100644 --- a/net-voip/telepathy-salut/telepathy-salut-9999.ebuild +++ b/net-voip/telepathy-salut/telepathy-salut-9999.ebuild @@ -2,12 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI="4" PYTHON_DEPEND="2:2.5" inherit autotools base python eutils git-2 DESCRIPTION="A link-local XMPP connection manager for Telepathy" -HOMEPAGE="http://telepathy.freedesktop.org/wiki/Components" +HOMEPAGE="http://telepathy.freedesktop.org/wiki/CategorySalut" SRC_URI="" EGIT_HAS_SUBMODULES="yes" EGIT_REPO_URI="git://anongit.freedesktop.org/telepathy/${PN}" @@ -32,11 +32,13 @@ DEPEND="${RDEPEND} dev-python/twisted-words ) dev-libs/libxslt dev-util/gtk-doc - dev-util/pkgconfig" + dev-util/pkgconfig + test? ( >=net-dns/avahi-0.6.22[python] )" pkg_setup() { DOCS="AUTHORS ChangeLog NEWS README" python_set_active_version 2 + python_pkg_setup } src_prepare() { @@ -52,5 +54,6 @@ src_configure() { econf \ $(use_enable test avahi-tests)\ --disable-plugins \ - --disable-Werror + --disable-Werror \ + --docdir=/usr/share/doc/${PF} } diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 756f0f66..9ddf43ae 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,2 +1,2 @@ DIST baselayout-2.1.tar.bz2 40398 RMD160 bba874c5d3290848236703125c130107c1244f55 SHA1 84783a773ec050700b3b0ce4c7645ae878f7f7fb SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956 -EBUILD baselayout-2.1-r1.ebuild 7327 RMD160 cda5782340eddfd9af1d0552eb604b00d2a43218 SHA1 b3b40efb60463e5937797358019af9e07e2c996f SHA256 1cd88bc52096eabf2740972017157772cbc7a6ce25733d1385241e471a94a3a4 +EBUILD baselayout-2.1-r1.ebuild 7586 RMD160 6313622f636cec9a22d7447a9771a48885a6ce06 SHA1 2ab68da0981f80362a5d5ac76184d2700b88c5b8 SHA256 4258dacd78aed797d67bac51091c8a6b4296746a8a31c8fe20ca6874c80aaeb7 diff --git a/sys-apps/baselayout/baselayout-2.1-r1.ebuild b/sys-apps/baselayout/baselayout-2.1-r1.ebuild index ee0d6748..d4c89714 100644 --- a/sys-apps/baselayout/baselayout-2.1-r1.ebuild +++ b/sys-apps/baselayout/baselayout-2.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="build +openrc" PDEPEND="openrc? ( sys-apps/openrc ) @@ -37,6 +37,8 @@ multilib_layout() { local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + # figure out which paths should be symlinks and which should be directories local dirs syms exp d for libdir in ${libdirs} ; do @@ -101,13 +103,17 @@ multilib_layout() { # make sure the old "lib" ABI location does not exist; we # only symlinked the lib dir on systems where we moved it # to "lib32" ... - if [ -d "${prefix}lib32" ] ; then - rm -f "${prefix}lib32"/.keep - if ! rmdir "${prefix}lib32" 2>/dev/null ; then - ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" - die "non-empty dir found where there should be none: ${prefix}lib32" + case ${CHOST} in + i?86*|x86_64*|powerpc*|sparc*|s390*) + if [ -d "${prefix}lib32" ] ; then + rm -f "${prefix}lib32"/.keep + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi fi - fi + ;; + esac else # nothing exists, so just set it up sanely ewarn "Initializing ${prefix}lib as a dir" diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest index 8999004c..ca2d9892 100644 --- a/x11-libs/libcryptui/Manifest +++ b/x11-libs/libcryptui/Manifest @@ -1 +1 @@ -EBUILD libcryptui-9999-r1.ebuild 1581 RMD160 480433f3c63d7be9acb3c54545661b7031499aa7 SHA1 a980c6209ca957ee2f6fe7c2c85f630bda3da249 SHA256 b3184418c6dd6e123da76a334c78ebb7ffc9ac22259be45cefc3ff2b7c78b18c +EBUILD libcryptui-9999-r1.ebuild 1505 RMD160 0ed20c90d48118746cf25976ab441b587189379a SHA1 c66a869465977ceb1e73634aa77c4231b008e283 SHA256 2fcf0a7ead771e922b40fca1e42a2c4e7244a5a3cdf61523dcdff5b73d39de77 diff --git a/x11-libs/libcryptui/libcryptui-9999-r1.ebuild b/x11-libs/libcryptui/libcryptui-9999-r1.ebuild index fd538b93..3a91bffd 100644 --- a/x11-libs/libcryptui/libcryptui-9999-r1.ebuild +++ b/x11-libs/libcryptui/libcryptui-9999-r1.ebuild @@ -6,7 +6,7 @@ EAPI="4" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit autotools eutils gnome2-live +inherit gnome2-live DESCRIPTION="User interface components for OpenPGP" HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html" @@ -18,7 +18,6 @@ KEYWORDS="" # Pull in libnotify-0.7 because it's controlled via an automagic ifdef COMMON_DEPEND=" - >=gnome-base/gconf-2:2 >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3[introspection?] >=dev-libs/dbus-glib-0.72 @@ -34,7 +33,6 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} sys-devel/gettext - >=app-text/gnome-doc-utils-0.3.2 >=app-text/scrollkeeper-0.3 >=dev-util/pkgconfig-0.20 >=dev-util/intltool-0.35 @@ -42,7 +40,7 @@ DEPEND="${COMMON_DEPEND} " # Before 3.1.4, libcryptui was part of seahorse RDEPEND="${COMMON_DEPEND} - !!<app-crypt/seahorse-3.1.4 + !<app-crypt/seahorse-3.1.4 " pkg_setup() { diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest deleted file mode 100644 index ccae40be..00000000 --- a/x11-misc/colord/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD colord-9999-r1.ebuild 1819 RMD160 faeca79a2e02fae232f7a6f4964a7e2224332436 SHA1 6858f0f9431e78843ce52f6157a5c3a2e09b586d SHA256 76d6b8f47bc49bf414e19c8c0edbae390399771ab246b7a85d275e13ea984e6d diff --git a/x11-misc/colord/colord-9999-r1.ebuild b/x11-misc/colord/colord-9999-r1.ebuild deleted file mode 100644 index 163c9232..00000000 --- a/x11-misc/colord/colord-9999-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -inherit base gnome2-live - -DESCRIPTION="System service to accurately color manage input and output devices" -HOMEPAGE="http://www.freedesktop.org/software/colord/" -EGIT_REPO_URI="git://gitorious.org/colord/master.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="doc examples +introspection scanner +udev" - -# XXX: raise to libusb-1.0.9:1 when available -COMMON_DEPEND=" - dev-db/sqlite:3 - >=dev-libs/glib-2.28.0:2 - >=dev-libs/libusb-1.0.8:1 - >=media-libs/lcms-2.2:2 - >=sys-auth/polkit-0.97 - introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) - scanner? ( media-gfx/sane-backends ) - udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) -" -RDEPEND="${COMMON_DEPEND} - media-gfx/shared-color-profiles" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.35 - dev-util/pkgconfig - >=sys-devel/gettext-0.17 - doc? ( - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-1.9 - ) - introspection? ( dev-lang/vala:0.14 ) -" - -# FIXME: needs pre-installed dbus service files -RESTRICT="test" - -DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO) - -src_configure() { - econf \ - --disable-examples \ - --disable-static \ - --enable-polkit \ - --enable-reverse \ - $(use_enable doc gtk-doc) \ - $(use_enable introspection) \ - $(use_enable scanner sane) \ - $(use_enable udev gudev) \ - VAPIGEN=$(type -p vapigen-0.14) - # parallel make fails in doc/api - use doc && MAKEOPTS=-j1 -} - -src_install() { - base_src_install - - # additional documentation files not included in tarball releases - [[ ${PV} = 9999 ]] && use doc && dodoc doc/*.txt doc/*.svg - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c - fi - - find "${D}" -name "*.la" -delete || die -} |