diff options
38 files changed, 973 insertions, 1193 deletions
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index b378e8ba1c4d..a6b0aba57f31 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,3 +1,4 @@ DIST tracker-1.10.1.tar.xz 5027912 SHA256 67ea78cca8ebbd6633dddcdd40b5205683cc886b872cde987e2a8bae171f4191 SHA512 aa523fad1c577926ec1f33692314afe673bdc6a84917c4ed506d29e8d0ec17dfacf0a6694cd794d140fc1498770b58d640ed4886c2827644665c92461764d7ce WHIRLPOOL 6947aef1420f15c879ae26a7c5e17ce0a34316077cba20b12dbb5be7e5f55ea840d6d0e145d3c19f47f3db640e07b043a6a25a7bd810bd6ac9a3de336f30f6d3 DIST tracker-1.8.0.tar.xz 4961488 SHA256 a11f31a373bfec3abae38ae719d0a59f666f1f067d8789ade2ed7032a152907d SHA512 c7d0600cfcf5485188167d237e22a00a5777b97b96c8735ba3efcef67288a8d9db9476f05289cf1498c50432981a4bc932973241138ea116a18e421576ed3cdd WHIRLPOOL 2941ab228ccaae96abf8ad1387d898981aae9611aaaa64425df21fb941ca4f49e485dfb094b191b1ec46f1b83f5e248fbce700b18b232209866fdb248b4bba53 DIST tracker-1.8.1.tar.xz 4985828 SHA256 e3ed4cb384486ebc086adfad68b5d25f8b0424eb6eb1aca2252a508b757fbe51 SHA512 2a1fa2a7d516c33290a7db52e33bb2ab7133ac543985f81136169f211ce42bd9b2e8539826e4da8acf365d9d49eb57a13bb4fd88d6523308af674ddd856bd2d9 WHIRLPOOL 00fc951d3faa1ec20289699d112669ec62ae7c87ecaf560d52936cd14076355b1610259ab5abab5b88e8ae7e93c18e3bb08c5946fef7bd04afd0befee27de9c9 +DIST tracker-1.8.2.tar.xz 4986908 SHA256 b93efbf077901315433a26b822ed6fb47a2592ee9d0fc7e054fe39a9968fa451 SHA512 6573597a847880d3f4fd1217a686ff47fbcfeee4da9019047362e111c1d196b420662dc5cbfad6f0d58605c8dee1ef50ffd6a5d9e7d0e1fc71c64780999a84c7 WHIRLPOOL 21737ba0b8b950dcb41b423d824b225e57fb62a5fff153417caf67be66287e72da8db906cc0b03d7928bd90540377f2713430d277440b4cdbd01cceb6087218a diff --git a/app-misc/tracker/tracker-1.8.2.ebuild b/app-misc/tracker/tracker-1.8.2.ebuild new file mode 100644 index 000000000000..1709789aa8cb --- /dev/null +++ b/app-misc/tracker/tracker-1.8.2.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_EAUTORECONF="yes" # See bug #367975 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit autotools bash-completion-r1 gnome2 linux-info python-any-r1 vala versionator virtualx + +DESCRIPTION="A tagging metadata database, search tool and indexer" +HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0/100" +# Once sys-power/upower-pm-utils is not needed by other reverse deps for +# suspending, we can drop it from here as this doesn't rely on the dead +# suspend support from old upower +IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf +gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager +pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +REQUIRED_USE=" + ?? ( gstreamer ffmpeg ) + cue? ( gstreamer ) + upnp-av? ( gstreamer ) + !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps ) +" + +# According to NEWS, introspection is non-optional +# glibc-2.12 needed for SCHED_IDLE (see bug #385003) +RDEPEND=" + >=app-i18n/enca-1.9 + >dev-db/sqlite-3.8.4.2:= + >=dev-libs/glib-2.40:2 + >=dev-libs/gobject-introspection-0.9.5:= + >=dev-libs/icu-4.8.1.1:= + || ( + >=media-gfx/imagemagick-5.2.1[png,jpeg?] + media-gfx/graphicsmagick[imagemagick,png,jpeg?] ) + >=media-libs/libpng-1.2:0= + >=media-libs/libmediaart-1.9:2.0 + sys-apps/util-linux + >=sys-libs/libseccomp-2.0 + >=x11-libs/pango-1:= + + cue? ( media-libs/libcue ) + elibc_glibc? ( >=sys-libs/glibc-2.12 ) + exif? ( >=media-libs/libexif-0.6 ) + ffmpeg? ( + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:0= ) + ) + firefox-bookmarks? ( || ( + >=www-client/firefox-4.0 + >=www-client/firefox-bin-4.0 ) ) + flac? ( >=media-libs/flac-1.2.1 ) + gif? ( media-libs/giflib:= ) + gsf? ( >=gnome-extra/libgsf-1.14.24:0= ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) + gtk? ( + >=dev-libs/libgee-0.3:0.8= + >=x11-libs/gtk+-3:3 ) + iptc? ( media-libs/libiptcdata ) + iso? ( >=sys-libs/libosinfo-0.2.9:= ) + jpeg? ( virtual/jpeg:0 ) + upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) + mp3? ( >=media-libs/taglib-1.6 ) + networkmanager? ( >=net-misc/networkmanager-0.8:= ) + pdf? ( + >=x11-libs/cairo-1:= + >=app-text/poppler-0.16:=[cairo,utils] + >=x11-libs/gtk+-2.12:2 ) + playlist? ( >=dev-libs/totem-pl-parser-3 ) + rss? ( >=net-libs/libgrss-0.7:0 ) + stemmer? ( dev-libs/snowball-stemmer ) + thunderbird? ( || ( + >=mail-client/thunderbird-5.0 + >=mail-client/thunderbird-bin-5.0 ) ) + tiff? ( media-libs/tiff:0 ) + upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) + vorbis? ( >=media-libs/libvorbis-0.22 ) + xml? ( >=dev-libs/libxml2-2.6 ) + xmp? ( >=media-libs/exempi-2.1:2 ) + xps? ( app-text/libgxps ) + !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + $(vala_depend) + dev-util/gdbus-codegen + >=dev-libs/libxslt-1 + >=dev-util/gtk-doc-am-1.8 + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + gtk? ( >=dev-libs/libgee-0.3:0.8 ) + test? ( + >=dev-libs/dbus-glib-0.82-r1 + >=sys-apps/dbus-1.3.1[X] ) +" +PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )" + +function inotify_enabled() { + if linux_config_exists; then + if ! linux_chkconfig_present INOTIFY_USER; then + ewarn "You should enable the INOTIFY support in your kernel." + ewarn "Check the 'Inotify support for userland' under the 'File systems'" + ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config" + die 'missing CONFIG_INOTIFY' + fi + else + einfo "Could not check for INOTIFY support in your kernel." + fi +} + +pkg_setup() { + linux-info_pkg_setup + inotify_enabled + + python-any-r1_pkg_setup +} + +src_prepare() { + # Don't run 'firefox --version' or 'thunderbird --version'; it results in + # access violations on some setups (bug #385347, #385495). + create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh + create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh + + # Looks like sorting got fixed but not test reference files, bug #???? + sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \ + -o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die + sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \ + -o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die + + gnome2_src_prepare + vala_src_prepare +} + +src_configure() { + local myconf="" + + if use gstreamer ; then + myconf="${myconf} --enable-generic-media-extractor=gstreamer" + if use upnp-av; then + myconf="${myconf} --with-gstreamer-backend=gupnp-dlna" + else + myconf="${myconf} --with-gstreamer-backend=discoverer" + fi + elif use ffmpeg ; then + myconf="${myconf} --enable-generic-media-extractor=libav" + else + myconf="${myconf} --enable-generic-media-extractor=external" + fi + + # unicode-support: libunistring, libicu or glib ? + # According to NEWS, introspection is required + # is not being generated + # nautilus extension is in a separate package, nautilus-tracker-tags + # miner-evolution disabled as it's incompatible with current eds + gnome2_src_configure \ + --disable-hal \ + --disable-miner-evolution \ + --disable-nautilus-extension \ + --disable-static \ + --enable-abiword \ + --enable-artwork \ + --enable-cfg-man-pages \ + --enable-dvi \ + --enable-enca \ + --enable-guarantee-metadata \ + --enable-icon \ + --enable-introspection \ + --enable-libmediaart \ + --enable-libpng \ + --enable-miner-apps \ + --enable-miner-user-guides \ + --enable-ps \ + --enable-text \ + --enable-tracker-fts \ + --enable-tracker-writeback \ + --with-unicode-support=libicu \ + --with-bash-completion-dir="$(get_bashcompdir)" \ + $(use_enable cue libcue) \ + $(use_enable exif libexif) \ + $(use_enable firefox-bookmarks miner-firefox) \ + $(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \ + FIREFOX="${S}"/firefox-version.sh \ + $(use_enable flac libflac) \ + $(use_enable gif libgif) \ + $(use_enable gsf libgsf) \ + $(use_enable gtk tracker-needle) \ + $(use_enable gtk tracker-preferences) \ + $(use_enable iptc libiptcdata) \ + $(use_enable iso libosinfo) \ + $(use_enable jpeg libjpeg) \ + $(use_enable upower upower) \ + $(use_enable miner-fs) \ + $(use_enable mp3 taglib) \ + $(use_enable mp3) \ + $(use_enable networkmanager network-manager) \ + $(use_enable pdf poppler) \ + $(use_enable playlist) \ + $(use_enable rss miner-rss) \ + $(use_enable stemmer libstemmer) \ + $(use_enable test functional-tests) \ + $(use_enable test unit-tests) \ + $(use_enable thunderbird miner-thunderbird) \ + $(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \ + THUNDERBIRD="${S}"/thunderbird-version.sh \ + $(use_enable tiff libtiff) \ + $(use_enable vorbis libvorbis) \ + $(use_enable xml libxml2) \ + $(use_enable xmp exempi) \ + $(use_enable xps libgxps) \ + ${myconf} +} + +src_test() { + # G_MESSAGES_DEBUG, upstream bug #699401#c1 + virtx emake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all" +} + +src_install() { + gnome2_src_install + + # Manually symlink extensions for {firefox,thunderbird}-bin + if use firefox-bookmarks; then + dosym /usr/share/xul-ext/trackerfox \ + /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org + fi + + if use thunderbird; then + dosym /usr/share/xul-ext/trackerbird \ + /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org + fi +} + +create_version_script() { + # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))" + + local v=$(best_version ${1}) + v=${v#${1}-} + local vbin=$(best_version ${1}-bin) + vbin=${vbin#${1}-bin-} + + if [[ -z ${v} ]]; then + v=${vbin} + else + version_compare ${v} ${vbin} + [[ $? -eq 1 ]] && v=${vbin} + fi + + echo -e "#!/bin/sh\necho $2 $v" > "$3" || die + chmod +x "$3" || die +} diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest index 8e9f0df120ad..9468bd73356b 100644 --- a/dev-libs/gmime/Manifest +++ b/dev-libs/gmime/Manifest @@ -1 +1,2 @@ DIST gmime-2.6.20.tar.xz 740696 SHA256 e0a170fb264c2ae4cecd852f4e7aaddb8d58e8f3f0b569ce2d2a4704f55bdf65 SHA512 8a43cc57fb2884a0d0979dd42775aa0946d11f460beb33fc7f7a166bcabb81b9590426072eeb606e2d5423ac4d68ff73d619fee96f33669f62069fcccfaf0a10 WHIRLPOOL efa42a42f4e3a1b92609307f8b9d26e7d93d42cf5545f988a8ecf1f2a6c574ecb6957cc4ed1d62aa60540e8aa802a4b2dba816677c23aa1f0d3a0e8228eb5b22 +DIST gmime-2.6.22.tar.xz 5216068 SHA256 c25f9097d5842a4808f1d62faf5eace24af2c51d6113da58d559a3bfe1d5553a SHA512 4f26ae15372f86392f996196d062dc05924923420ffbbfe0d22b53d1d3a38e2158f6faf50884bcfe04b33d84bd25e360eef0483f97bbdbb20c8ed4410d2c7815 WHIRLPOOL 526a6ef2126340d3d6dc98b7a8e18e3418c31dd45715b8d832e11296a7bb0ca68188fd41bb2b87f7c5d0be4e0b58b424276c2b779317420f3e93d19682df821e diff --git a/dev-libs/gmime/gmime-2.6.20-r3.ebuild b/dev-libs/gmime/gmime-2.6.20-r3.ebuild index 761abcfd5c27..2fd3fe6295bd 100644 --- a/dev-libs/gmime/gmime-2.6.20-r3.ebuild +++ b/dev-libs/gmime/gmime-2.6.20-r3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime SLOT="2.6" LICENSE="LGPL-2.1" -KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="doc mono smime static-libs vala" RDEPEND=" diff --git a/dev-libs/gmime/gmime-2.6.20.ebuild b/dev-libs/gmime/gmime-2.6.20.ebuild deleted file mode 100644 index b0e7c0a741a8..000000000000 --- a/dev-libs/gmime/gmime-2.6.20.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -VALA_USE_DEPEND="vapigen" - -inherit eutils mono-env gnome2 vala - -DESCRIPTION="Utilities for creating and parsing messages using MIME" -HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/" - -SLOT="2.6" -LICENSE="LGPL-2.1" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="doc mono static-libs vala" - -RDEPEND=" - >=dev-libs/glib-2.18:2 - sys-libs/zlib - >=app-crypt/gpgme-1.1.6 - mono? ( - dev-lang/mono - >=dev-dotnet/glib-sharp-2.4.0:2 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.8 - virtual/pkgconfig - doc? ( app-text/docbook-sgml-utils ) - mono? ( dev-dotnet/gtk-sharp-gapi:2 ) - vala? ( - $(vala_depend) - >=dev-libs/gobject-introspection-1.30.0 ) -" - -pkg_setup() { - use mono && mono-env_pkg_setup -} - -src_prepare() { - gnome2_src_prepare - use vala && vala_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --enable-cryptography \ - --disable-strict-parser \ - $(use_enable mono) \ - $(use_enable static-libs static) \ - $(use_enable vala) -} - -src_compile() { - MONO_PATH="${S}" gnome2_src_compile - if use doc; then - emake -C docs/tutorial html - fi -} - -src_install() { - GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \ - gnome2_src_install - - if use doc ; then - docinto tutorial - dodoc docs/tutorial/html/* - fi -} diff --git a/dev-libs/gmime/gmime-2.6.20-r2.ebuild b/dev-libs/gmime/gmime-2.6.22.ebuild index 9d51d74d29bb..e1cb3dad15b0 100644 --- a/dev-libs/gmime/gmime-2.6.20-r2.ebuild +++ b/dev-libs/gmime/gmime-2.6.22.ebuild @@ -2,33 +2,32 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -GCONF_DEBUG="no" +EAPI=6 VALA_USE_DEPEND="vapigen" -inherit eutils mono-env gnome2 vala +inherit mono-env gnome2 vala DESCRIPTION="Utilities for creating and parsing messages using MIME" HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/" SLOT="2.6" LICENSE="LGPL-2.1" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="doc mono smime static-libs vala" RDEPEND=" - >=dev-libs/glib-2.18:2 + >=dev-libs/glib-2.32.0:2 sys-libs/zlib mono? ( dev-lang/mono - >=dev-dotnet/glib-sharp-2.4.0:2 ) - smime? ( >=app-crypt/gpgme-1.1.6 ) + >=dev-dotnet/gtk-sharp-2.12.21:2 ) + smime? ( >=app-crypt/gpgme-1.1.6:1= ) " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.8 + virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) - mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( $(vala_depend) >=dev-libs/gobject-introspection-1.30.0 ) diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index 091ebceb3b0a..3361520b3d6b 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1,2 +1,2 @@ -DIST libgweather-3.18.2.tar.xz 3431224 SHA256 f35e52fa4023369ef5e04851311b3f15c9d7103ec801d0567eb3dec5851e71e3 SHA512 6e5ef37a50b22bb3941b703046bfcec78c6fd29aad3084c1a707a37f0418bc61c4852aa34501daaf20f6796e528a7ece948092b224d6f696b9d9e856fc384991 WHIRLPOOL 58f3d6a0c9acd4460a50077147ca9429a216777b402530632d922b38b9a47dd750b136be377cd3382de4638fa85bbab888a2356539f56e8f68a1787d346f459e DIST libgweather-3.20.3.tar.xz 3376700 SHA256 fb6bc5b64ef5db3dc40a9798f072b83ebcafe7ff5af472aaee70600619b56c0b SHA512 feaf5a3ec5766934e482224cc4ca970db49c86addaabcae623d3ac1cadc7dc4a4759cb88552af7e92124f52a7a921ceef94759509cdc3e1fe20c749531ef7ad9 WHIRLPOOL 5e569741a3e75929d7bdba2e3aa69fc42df9472ecc6626e5f7b95a12dad9d5d5af9a87b73417056b54192b9a0ca47076a21cc18ad5c81a6fd349edaa1b5f7537 +DIST libgweather-3.20.4.tar.xz 3342220 SHA256 7dcdc555c48461d07a198bc44e0e6ed39105d8513b12fa97c4590f5b2d912fc2 SHA512 65b28a2bf8e9e7d8b02972d1d2f701ac8668b1e91154ba7ee94e9a08bb98d28ce44e88842e2fe78a13ce9f942d79fd2950d8de266dae28bb262c5fc11328ada9 WHIRLPOOL f01170d5e7790c22b1bfba8b6cd0e7b90708a818be2dc12a698e5ab4babb3efb6dfc368d7538b546a893a1b17b11ed04ebb0050c62b368f8f354ad9102b3c6e8 diff --git a/dev-libs/libgweather/libgweather-3.18.2.ebuild b/dev-libs/libgweather/libgweather-3.20.4.ebuild index 4ae6017d8ca3..fb17cb8d77fe 100644 --- a/dev-libs/libgweather/libgweather-3.18.2.ebuild +++ b/dev-libs/libgweather/libgweather-3.20.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,16 +12,17 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather" LICENSE="GPL-2+" SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix) + IUSE="glade +introspection vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" COMMON_DEPEND=" >=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 - >=net-libs/libsoup-2.34:2.4 - >=dev-libs/libxml2-2.6.0 + >=net-libs/libsoup-2.44:2.4 + >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index de7a636173fe..d64b31b73c6b 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -10,7 +10,19 @@ # Exports portage base functions used by ebuilds written for packages using the # GNOME framework. For additional functions, see gnome2-utils.eclass. -inherit eutils libtool gnome.org gnome2-utils xdg +# @ECLASS-VARIABLE: GNOME2_EAUTORECONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Run eautoreconf instead of only elibtoolize +GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} + +if [[ ${GNOME2_EAUTORECONF} == 'yes' ]] ; then + AUTOTOOLS_AUTO_DEPEND=yes +else + : ${AUTOTOOLS_AUTO_DEPEND:=no} +fi + +inherit autotools eutils libtool gnome.org gnome2-utils xdg case "${EAPI:-0}" in 4|5) @@ -113,9 +125,13 @@ gnome2_src_prepare() { # Disable all deprecation warnings gnome2_disable_deprecation_warning - # Run libtoolize + # Run libtoolize or eautoreconf, bug #591584 # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - elibtoolize ${ELTCONF} + if [[ ${GNOME2_EAUTORECONF} == 'yes' ]]; then + eautoreconf + else + elibtoolize ${ELTCONF} + fi } # @FUNCTION: gnome2_src_configure diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest index 22510e547c0e..1972c43165bf 100644 --- a/games-board/gnuchess/Manifest +++ b/games-board/gnuchess/Manifest @@ -1,3 +1 @@ -DIST gnuchess-6.2.2.tar.gz 747054 SHA256 7776c114eeb5889dea69dc4715a3622ec57f65efab667987e7d7183cc05381a8 SHA512 3b9bbf8999301a867f6b0e277ee01240472553d4e6dd43b9c479558b3bba687ebaa188f23cc8dbcb8656ddbd5c9511d89cf68ae717c55824f0c797460c4ab101 WHIRLPOOL 454ee7ec902ffd342142d9d04ccb6cf0d4f6bfcd2575b039d39adb78c0b016b8971609016754704750edbc13b2ec962639cf306c27ca460ffaa8009764686eee -DIST gnuchess-6.2.3.tar.gz 757846 SHA256 78999176b2f2b5e0325bcc69749b7b2cefb7b1ef4f02d101fa77ae24a1b31b82 SHA512 a5e65fedc8459356e0e0b4dc4438f068bc0239d368138a716365a436e34def97e9f85005219b54e8feb644d42375a1eafde01386c793c43e3c42548eb8c06231 WHIRLPOOL 0fb713e454dcc50aa1ab6bb7e5ac0d01f902d81abfa0413301b059a6386c4cfd3b79a7373b140e46c4b5f6e4c635115f844efcf24c004d8b6d6b447e70c7f753 DIST gnuchess-6.2.4.tar.gz 757985 SHA256 3c425c0264f253fc5cc2ba969abe667d77703c728770bd4b23c456cbe5e082ef SHA512 53546d3319cd6a7bc70be5cc11c29cf33c71b747de2244a7d8d4aff6b00318ad35ee0e27058b40a265c62ef02c188d2e34cba9bbf439306220796e7332904d42 WHIRLPOOL b4355c0fa4672352b281b5795789eadff3cff4ba3d450977b6c5be148a2c20f29b02c6c6280ff7e9369aeca7d45c6850a61d61013e46c68599d7fbbe9f85254d diff --git a/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild b/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild deleted file mode 100644 index 9a2788aa89af..000000000000 --- a/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils flag-o-matic games - -DESCRIPTION="Console based chess interface" -HOMEPAGE="https://www.gnu.org/software/chess/chess.html" -SRC_URI="mirror://gnu/chess/${P}.tar.gz" - -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -src_prepare() { - epatch "${FILESDIR}"/${P}-addbook.patch -} - -src_configure() { - strip-flags # bug #199097 - egamesconf --without-readline # bug 491088 -} - -src_install () { - default - prepgamesdirs -} diff --git a/games-board/gnuchess/gnuchess-6.2.3.ebuild b/games-board/gnuchess/gnuchess-6.2.3.ebuild deleted file mode 100644 index 26dfc41fea03..000000000000 --- a/games-board/gnuchess/gnuchess-6.2.3.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils flag-o-matic - -DESCRIPTION="Console based chess interface" -HOMEPAGE="https://www.gnu.org/software/chess/chess.html" -SRC_URI="mirror://gnu/chess/${P}.tar.gz" - -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -src_configure() { - strip-flags # bug #199097 - econf --without-readline # bug 491088 -} diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index fb3702131d10..295dafa2dc4f 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,3 +1,4 @@ DIST nautilus-3.20.3.tar.xz 3437224 SHA256 46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e SHA512 dbd23fd88f66b80056970f3e189e85aadf4c8ecb7ee1e103acda2da2b1aef99cb40d1dbfaa1dc905a8adda4bb9e591badb1b6b9762c6dc5b6d9b9f175747959b WHIRLPOOL 0036c7fe7e1d4494926c872bbec2a180cb262783c1e1a58c0f2f580dec8fcbeba56590060fda70a6fbd40b20282879afa1263bffaf998a529e3205b382370e4f +DIST nautilus-3.20.4.tar.xz 3453376 SHA256 b15f4778950752e5d5748f198d69106be3425cdc70574be75c25f8f931a2766c SHA512 01bee5c70067c508ca918948afe0b400680eb68518ae69803e2971a215b0eaf54c9251566c6c44835a1c0b9b20248450539a47936c6aba5c9accc9ef3cbe8a8e WHIRLPOOL bf9a3549cb16c8860a470aac07b91cee349adf7ac820847afe093db160fd2f9a4c9f2c6cf7625c7f19415a6957547353662edd33358ddf0b1a86f33169812314 DIST nautilus-3.22.1.tar.xz 5139460 SHA256 17e37ffecebb2cf29e6bfb52111a951f0c67534b9dabf0210c12d15abb7dbddc SHA512 cb27b1c476a6a19959050bf1ea6ae34a4e7136ea261efd922fc03e362ba1357f4709547ed8bbff9e1d4f8892aff5f08a9e03aadc8c52a6202c1d6d7f201e51f0 WHIRLPOOL 3687d2a8a52f512c6c5e47f20f096e6ed750cf83202714cae8b755df520373527292e4ca1e565226f145bf43ac33b035e0a1dc390711457635d6015763f73481 DIST nautilus-3.22.2.tar.xz 5120196 SHA256 ce1c9e97173b51750521971a26943593b397a08a2736b340ef5b130095ee65b3 SHA512 2a11801ded930a0a8a699e385063954ff1e579c0c78ffc209c5da9c8f06fde91cccf01e6d6b97e4c1faee96d1fe3415197e8df14cb1cd876de42240d9f0eedae WHIRLPOOL d7cb14e0801e6aeefb220071bffbd7469cb41359e7a8f54a7f1ac165a86d4052ff5de8850c93692a7b63313c655074ede4885ae787196722f9df2c4038cb4f2b diff --git a/gnome-base/nautilus/nautilus-3.20.4.ebuild b/gnome-base/nautilus/nautilus-3.20.4.ebuild new file mode 100644 index 000000000000..a4a984c719a2 --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.20.4.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' + +inherit gnome2 readme.gentoo-r1 virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" +SLOT="0" +IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" + +# FIXME: tests fails under Xvfb, but pass when building manually +# "FAIL: check failed in nautilus-file.c, line 8307" +# need org.gnome.SessionManager service (aka gnome-session) but cannot find it +RESTRICT="test" + +# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 +# and 2.30.0 +COMMON_DEPEND=" + >=dev-libs/glib-2.45.7:2[dbus] + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.19.12:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + >=gnome-base/gnome-desktop-3:3= + + gnome-base/dconf + >=gnome-base/gsettings-desktop-schemas-3.8.0 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + + exif? ( >=media-libs/libexif-0.6.20 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + selinux? ( >=sys-libs/libselinux-2 ) + tracker? ( >=app-misc/tracker-0.16:= ) + xmp? ( >=media-libs/exempi-2.1.0:2 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.33 + >=dev-util/gtk-doc-am-1.10 + >=dev-util/intltool-0.50 + sys-devel/gettext + virtual/pkgconfig + x11-proto/xproto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) +" + +# For eautoreconf +# gnome-base/gnome-common +# dev-util/gtk-doc-am" + +PDEPEND=" + gnome? ( x11-themes/adwaita-icon-theme ) + tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) + previewer? ( >=gnome-extra/sushi-0.1.9 ) + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) + >=gnome-base/gvfs-1.14[gtk] +" +# Need gvfs[gtk] for recent:/// support + +src_prepare() { + if use previewer; then + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. + To activate the previewer, select a file and press space; to + close the previewer, press space again." + fi + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-profiling \ + --disable-update-mimedb \ + $(use_enable exif libexif) \ + $(use_enable introspection) \ + $(use_enable packagekit) \ + $(use_enable sendto nst-extension) \ + $(use_enable selinux) \ + $(use_enable tracker) \ + $(use_enable xmp) +} + +src_test() { + virtx emake check +} + +src_install() { + use previewer && readme.gentoo_create_doc + gnome2_src_install +} + +pkg_postinst() { + gnome2_pkg_postinst + + if use previewer; then + readme.gentoo_print_elog + else + elog "To preview media files, emerge nautilus with USE=previewer" + fi +} diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest index b378e8ba1c4d..a6b0aba57f31 100644 --- a/gnome-extra/nautilus-tracker-tags/Manifest +++ b/gnome-extra/nautilus-tracker-tags/Manifest @@ -1,3 +1,4 @@ DIST tracker-1.10.1.tar.xz 5027912 SHA256 67ea78cca8ebbd6633dddcdd40b5205683cc886b872cde987e2a8bae171f4191 SHA512 aa523fad1c577926ec1f33692314afe673bdc6a84917c4ed506d29e8d0ec17dfacf0a6694cd794d140fc1498770b58d640ed4886c2827644665c92461764d7ce WHIRLPOOL 6947aef1420f15c879ae26a7c5e17ce0a34316077cba20b12dbb5be7e5f55ea840d6d0e145d3c19f47f3db640e07b043a6a25a7bd810bd6ac9a3de336f30f6d3 DIST tracker-1.8.0.tar.xz 4961488 SHA256 a11f31a373bfec3abae38ae719d0a59f666f1f067d8789ade2ed7032a152907d SHA512 c7d0600cfcf5485188167d237e22a00a5777b97b96c8735ba3efcef67288a8d9db9476f05289cf1498c50432981a4bc932973241138ea116a18e421576ed3cdd WHIRLPOOL 2941ab228ccaae96abf8ad1387d898981aae9611aaaa64425df21fb941ca4f49e485dfb094b191b1ec46f1b83f5e248fbce700b18b232209866fdb248b4bba53 DIST tracker-1.8.1.tar.xz 4985828 SHA256 e3ed4cb384486ebc086adfad68b5d25f8b0424eb6eb1aca2252a508b757fbe51 SHA512 2a1fa2a7d516c33290a7db52e33bb2ab7133ac543985f81136169f211ce42bd9b2e8539826e4da8acf365d9d49eb57a13bb4fd88d6523308af674ddd856bd2d9 WHIRLPOOL 00fc951d3faa1ec20289699d112669ec62ae7c87ecaf560d52936cd14076355b1610259ab5abab5b88e8ae7e93c18e3bb08c5946fef7bd04afd0befee27de9c9 +DIST tracker-1.8.2.tar.xz 4986908 SHA256 b93efbf077901315433a26b822ed6fb47a2592ee9d0fc7e054fe39a9968fa451 SHA512 6573597a847880d3f4fd1217a686ff47fbcfeee4da9019047362e111c1d196b420662dc5cbfad6f0d58605c8dee1ef50ffd6a5d9e7d0e1fc71c64780999a84c7 WHIRLPOOL 21737ba0b8b950dcb41b423d824b225e57fb62a5fff153417caf67be66287e72da8db906cc0b03d7928bd90540377f2713430d277440b4cdbd01cceb6087218a diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.2.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.2.ebuild new file mode 100644 index 000000000000..eb3096c683f2 --- /dev/null +++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME_ORG_MODULE="tracker" + +inherit gnome.org toolchain-funcs + +DESCRIPTION="Nautilus extension to tag files for Tracker" +HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="" + +COMMON_DEPEND=" + ~app-misc/tracker-${PV} + >=dev-libs/glib-2.38:2 + >=gnome-base/nautilus-2.90 + x11-libs/gtk+:3 +" +RDEPEND="${COMMON_DEPEND} + !<app-misc/tracker-0.12.5-r1[nautilus] +" +# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker +DEPEND="${COMMON_DEPEND}" + +S="${S}/src/plugins/nautilus" + +pkg_setup() { + tc-export CC + export TRACKER_API=1.0 +} + +src_prepare() { + default + cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed" + # config.h is not used, but is included in every source file... + sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed" +} diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest index ef665afe08ea..d0a7244a38cb 100644 --- a/mail-client/geary/Manifest +++ b/mail-client/geary/Manifest @@ -1,2 +1,3 @@ DIST geary-0.11.1.tar.xz 958616 SHA256 6efc5e1a944ca1c1a991d50d558fbe46ed58763b3f8b7bcd451b15078a9b2eb2 SHA512 5dc50c2c004a48d1df6c17ba492f24a27c51fa1ab2ea01c77d633611783781e9714aeec9bd6dad58856675c3d10d8223d5c75800a32676d7425e896d8479e4ad WHIRLPOOL 3cf0efd34fb4a97a0fb99fe118d6b34d20489a3bae7cd967e833327650596bfa0d49464601dd9cc1ff7d43fd94ee21a4e28726ecdba5c42e9dded724d72e90ea DIST geary-0.11.2.tar.xz 961724 SHA256 5c9e20ecd53672a42e22a436b9d3b6b9e9bf81ddf77163414a1c55986f9b4631 SHA512 cbfb7461d3125c94e24a32c1cf6baad417d07ac274f1f1f1df4ef7f07b6c6b872a32a35e69bf33c6c6b8960ac4cf8135984ca33f4d4c8861e4c0a1f22525ba88 WHIRLPOOL 876611449868bd03ae26b4dde13c11c16ee8da7497016235a9e8cca10563bad793a5ae5c80147dfcb2e5c41be4f342d372172702de02880525ff3b797ca9a1bb +DIST geary-0.11.3.tar.xz 964024 SHA256 419e9875c81d00e990aab61d419e64ca925928f046af88362d9029a7ba8c82e4 SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b WHIRLPOOL 3314a7f4b87c5d9e52d9abaefb7b26f1b0713afaadb05f396da92f5dc842745e223f84f1aedad00eafe20e95def6836058175acdb1a5a96d3628f664a29be3ae diff --git a/mail-client/geary/geary-0.11.3.ebuild b/mail-client/geary/geary-0.11.3.ebuild new file mode 100644 index 000000000000..a74afe8ac17a --- /dev/null +++ b/mail-client/geary/geary-0.11.3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +# Keep cmake-utils at the end +inherit gnome2 vala cmake-utils + +DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" +HOMEPAGE="https://wiki.gnome.org/Apps/Geary" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +DEPEND=" + >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] + app-crypt/libsecret + dev-db/sqlite:3 + dev-libs/glib:2[dbus] + >=dev-libs/libgee-0.8.5:0.8= + dev-libs/libxml2:2 + dev-libs/gmime:2.6 + media-libs/libcanberra + >=net-libs/webkit-gtk-1.10.0:3=[introspection] + >=x11-libs/gtk+-3.10.0:3[introspection] + x11-libs/libnotify +" +RDEPEND="${DEPEND} + gnome-base/gsettings-desktop-schemas + nls? ( virtual/libintl ) +" +DEPEND="${DEPEND} + app-text/gnome-doc-utils + dev-util/desktop-file-utils + nls? ( sys-devel/gettext ) + $(vala_depend) + virtual/pkgconfig +" + +src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=751556 + # https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in + # 0.12) + eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=751557 + eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=751558 + eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch + + local i + if use nls ; then + if [[ -n "${LINGUAS+x}" ]] ; then + for i in $(cd po ; echo *.po) ; do + if ! has ${i%.po} ${LINGUAS} ; then + sed -i -e "/^${i%.po}$/d" po/LINGUAS || die + fi + done + fi + else + sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die + fi + + cmake-utils_src_prepare + gnome2_src_prepare + vala_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DDESKTOP_UPDATE=OFF + -DNO_FATAL_WARNINGS=ON + -DGSETTINGS_COMPILE=OFF + -DICON_UPDATE=OFF + -DVALA_EXECUTABLE="${VALAC}" + -DWITH_UNITY=OFF + -DDESKTOP_VALIDATE=OFF + ) + + cmake-utils_src_configure +} diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest index e190627f2f6d..4a563ebd888c 100644 --- a/net-libs/phodav/Manifest +++ b/net-libs/phodav/Manifest @@ -1 +1,2 @@ DIST phodav-2.0.tar.xz 277672 SHA256 53b42faf2d6edfb0072dbbbe9b8360d8603cca2cacd142df8d1781b9ba0cb9ed SHA512 4da0f3ef7ce2ffd89e43569ad00456f9580f4005a6830a8cc36a7787cc9e06d285326376373a0d690a1868b1c10da0f3ba49b4eb8dcff3042f5c64cbe1fe0aba WHIRLPOOL 5d1ba19f502a72a86e7dbf47ca43cd5d711241fcdb936364c98de88df57cb49db88cdd0768c133bb936c40be98107f06d8b6d8f8cb1b51d2a05e33b83d36f8a4 +DIST phodav-2.1.tar.xz 293128 SHA256 da6073440b4cfd63f4d65b17e1a2a35ff501c7c940591da4533a03c2233ab898 SHA512 e43bd4c9ed97b7454e8452246c37211905b4cff430e91f3d2d36182736e1b8924d6ad477f58f110c98b85f02c085cd12c099020a0bea8abb19e65a9d52e1f4a8 WHIRLPOOL 4091fb0ac23b6a57c385054afa66a61eb038a37593167d888755dad38894898b45d7fcab6fa6d7582e4e2c5f0879e1ac782df2efc03e7e4372ac0a3341a4b10d diff --git a/net-libs/phodav/phodav-2.1.ebuild b/net-libs/phodav/phodav-2.1.ebuild new file mode 100644 index 000000000000..3b419e3d627f --- /dev/null +++ b/net-libs/phodav/phodav-2.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 systemd udev + +DESCRIPTION="WebDav server implementation using libsoup" +HOMEPAGE="https://wiki.gnome.org/phodav" + +LICENSE="LGPL-2.1+" +SLOT="2.0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="spice systemd zeroconf" + +RDEPEND=" + dev-libs/glib:2 + >=net-libs/libsoup-2.48:2.4 + dev-libs/libxml2 + zeroconf? ( net-dns/avahi ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.10 + >=dev-util/intltool-0.40.0 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --program-suffix=-${SLOT} \ + $(use_with zeroconf avahi) \ + --with-udevdir=$(get_udevdir) \ + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) + + if ! use zeroconf ; then + sed -i -e 's|avahi-daemon.service||' data/spice-webdavd.service || die + fi +} + +src_install() { + gnome2_src_install + + if use spice ; then + if ! use systemd ; then + newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd + udev_dorules "${FILESDIR}/70-spice-webdavd.rules" + rm -r "${D}$(systemd_get_unitdir)" || die + fi + else + rm -r "${D}"{/usr/sbin,$(get_udevdir),$(systemd_get_systemunitdir)} || die + fi +} diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 75e4446f8231..89e7faa17c5e 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,5 +1,3 @@ DIST NetworkManager-1.0.12.tar.xz 3490836 SHA256 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e SHA512 926c0139dc7ade7bbc512f0d2e386a42a278aceff68996bc3a18fb1940f5d516f0ff2768459d6f50fd5669d72c15202307396bb3cf8b67c3dbac19db484b971c WHIRLPOOL 6178af61fb30a7e8b72cc05296a014a5be5b10fed41cd5385f0bebae1fa22519c83cf8c359479372f063fc2b891715015454c53cd4f1f1516fc03bca76a552ac -DIST NetworkManager-1.2.4.tar.xz 3728788 SHA256 19bfb7306dd472d010443a8027d91f9fd50fe6e0c5aa4ea8083845de0fa38faa SHA512 83fa179c0f360c7f40504cf58275e28638b5a986458c99adc85567595ca170ac3d081ffa0c99e5619c97d4a3228e5318e613330894547ad3438eaa2bfcc1f28b WHIRLPOOL 625cf2a32f5fb1e5ae537f2285f6945ca14f438959fb5556b490a90fe16eddcfb22e84c82f8f0f479f2387ec54ba292b18f28c0676375d729f9bb6a435d9e12b DIST NetworkManager-1.4.0.tar.xz 3699568 SHA256 c4d5e075998a291074501602a5068a7e54d9e0f2658aba079d58145d65be531d SHA512 2580e885684f6ad464eebdf9e0dab5432d4d45f0f4127af7f8947be16fc5ce84a5cc090e195b68619c14e218d9cffcde1615400c19326e58bdac8fdf7b53fb46 WHIRLPOOL 39607ac0606039c242b2033b9e540c3beb88e7f48fdb8188d942341a57e097dc0e9c7bde248b6d9ae65bd3ac94df83b5e7d7a371baf7f32c8542581c3bdf778c -DIST NetworkManager-1.4.2.tar.xz 3758636 SHA256 a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204 SHA512 9ed7798d483e68148a35c63f9a5ddaddaa72ffc8455d7547b618c4cb01090274197ebbf627c497f305601496f3b265463ca3f082b3772c88bbd370e83f0e15f2 WHIRLPOOL cba501716c8843422efa3402d1a49b45288eedc4bbb4f376989b854dea17b02ef726ba26d4b6704eba9f1dba19c64f79cf78d5287948923fe45fd3c1bb6284d3 DIST NetworkManager-1.4.4.tar.xz 3762664 SHA256 829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 WHIRLPOOL d5e4ca3868c2aa8bceec2029c573b61ccc2fbc9f9a84cb8360ecf7d7503011f0501e9bffd54b163de8e84606ad7977b3c187adb78beed3a44bf2a3ee9821631f diff --git a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch b/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch deleted file mode 100644 index 52a21c44738e..000000000000 --- a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 10ba492047b1ad80adeeb878e7f155a13638da7f Mon Sep 17 00:00:00 2001 -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 18 May 2016 10:43:51 +0200 -Subject: [PATCH] sleep-monitor-upower: add missing include - -Otherwise building fails with: - - nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get' - nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token - -https://mail.gnome.org/archives/networkmanager-list/2016-May/msg00053.html ---- - src/nm-sleep-monitor-upower.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c -index 5f0ff24..8d07190 100644 ---- a/src/nm-sleep-monitor-upower.c -+++ b/src/nm-sleep-monitor-upower.c -@@ -24,6 +24,7 @@ - #include <sys/stat.h> - - #include "nm-core-internal.h" -+#include "NetworkManagerUtils.h" - - #include "nm-sleep-monitor.h" - --- -2.9.0 - diff --git a/net-misc/networkmanager/networkmanager-1.2.4.ebuild b/net-misc/networkmanager/networkmanager-1.2.4.ebuild deleted file mode 100644 index 2952e009f9aa..000000000000 --- a/net-misc/networkmanager/networkmanager-1.2.4.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version - -IUSE="bluetooth connection-sharing consolekit +dhclient gnutls +introspection \ -kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ -vala +wext +wifi" - -REQUIRED_USE=" - modemmanager? ( ppp ) - wext? ( wifi ) - ^^ ( nss gnutls ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] - >=dev-libs/libnl-3.2.8:3= - >=sys-auth/polkit-0.106 - net-libs/libndp - >=net-libs/libsoup-2.40:2.4= - net-misc/iputils - sys-libs/readline:0= - >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dhcp] - net-firewall/iptables ) - gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - modemmanager? ( >=net-misc/modemmanager-0.7.991 ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - dhclient? ( >=net-misc/dhcp-4[client] ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - systemd? ( >=sys-apps/systemd-209:0= ) - !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) - teamd? ( >=net-misc/libteam-1.9 ) -" -RDEPEND="${COMMON_DEPEND} - consolekit? ( sys-auth/consolekit ) - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) -" -DEPEND="${COMMON_DEPEND} - dev-util/gdbus-codegen - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-2.6.29 - virtual/pkgconfig - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - else - return 0 - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - enewgroup plugdev -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - local PATCHES=( - # https://bugs.gentoo.org/590432 - "${FILESDIR}/1.2.4-upower.patch" - ) - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - mkdir man || die - find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die - else - # libnl, libndp are only used for executables, not libraries - myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) - fi - - # ifnet plugin always disabled until someone volunteers to actively - # maintain and fix it - # Also disable dhcpcd support as it's also completely unmaintained - # and facing bugs like #563938 and many others - # - # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are - # still not ready for removing that lib - ECONF_SOURCE=${S} \ - runstatedir="/run" \ - gnome2_src_configure \ - --disable-more-warnings \ - --disable-static \ - --localstatedir=/var \ - --disable-lto \ - --disable-config-plugin-ibft \ - --disable-ifnet \ - --disable-qt \ - --without-netconfig \ - --with-dbus-sys-dir=/etc/dbus-1/system.d \ - --with-libnm-glib \ - --with-nmcli=yes \ - --with-udev-dir="$(get_udevdir)" \ - --with-config-plugins-default=keyfile \ - --with-iptables=/sbin/iptables \ - $(multilib_native_with libsoup) \ - $(multilib_native_enable concheck) \ - --with-crypto=$(usex nss nss gnutls) \ - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ - --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \ - $(multilib_native_use_enable bluetooth bluez5-dun) \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_enable ppp) \ - $(use_with dhclient) \ - --without-dhcpcd \ - $(multilib_native_use_with modemmanager modem-manager-1) \ - $(multilib_native_use_with ncurses nmtui) \ - $(multilib_native_use_with resolvconf) \ - $(multilib_native_use_with selinux) \ - $(multilib_native_use_with systemd systemd-journal) \ - $(multilib_native_use_enable teamd teamdctl) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable vala) \ - --without-valgrind \ - $(multilib_native_use_with wext) \ - $(multilib_native_use_enable wifi) \ - "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in api libnm libnm-util libnm-glib; do - ln -s "${S}"/docs/${d}/html docs/${d}/html || die - done - fi - - # Disable examples - # https://bugzilla.gnome.org/show_bug.cgi?id=769711 - cat > examples/Makefile <<-EOF - .PHONY: all check install - all: - check: - install: - EOF -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - emake all-am - emake -C shared - emake -C introspection # generated headers, needed for libnm - emake -C libnm-core - emake -C libnm - emake -C libnm-util - emake -C libnm-glib - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - else - emake DESTDIR="${D}" install-am - emake DESTDIR="${D}" install -C shared - emake DESTDIR="${D}" install -C introspection - emake DESTDIR="${D}" install -C libnm-core - emake DESTDIR="${D}" install -C libnm - emake DESTDIR="${D}" install -C libnm-util - emake DESTDIR="${D}" install -C libnm-glib - fi -} - -multilib_src_install_all() { - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - # Remove empty /run/NetworkManager - rmdir "${D}"/run/NetworkManager "${D}"/run || die -} - -pkg_postinst() { - gnome2_pkg_postinst - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - 574d0cfa7e911b1f7792077003060240* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.4.0.ebuild b/net-misc/networkmanager/networkmanager-1.4.0.ebuild deleted file mode 100644 index 5ea616b983c5..000000000000 --- a/net-misc/networkmanager/networkmanager-1.4.0.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version - -IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \ -json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \ -systemd teamd test vala +wext +wifi" - -REQUIRED_USE=" - modemmanager? ( ppp ) - vala? ( introspection ) - wext? ( wifi ) - ^^ ( nss gnutls ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -# TODO: need multilib janson (linked to libnm.so) -COMMON_DEPEND=" - >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] - >=dev-libs/libnl-3.2.8:3= - >=sys-auth/polkit-0.106 - net-libs/libndp - >=net-libs/libsoup-2.40:2.4= - net-misc/iputils - sys-libs/readline:0= - >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dhcp] - net-firewall/iptables ) - consolekit? ( >=sys-auth/consolekit-1.0.0 ) - dhclient? ( >=net-misc/dhcp-4[client] ) - gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( dev-libs/jansson ) - modemmanager? ( >=net-misc/modemmanager-0.7.991 ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - ofono? ( net-misc/ofono ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - !systemd? ( - !consolekit? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) - ) - teamd? ( >=net-misc/libteam-1.9 ) -" -RDEPEND="${COMMON_DEPEND} - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) -" -DEPEND="${COMMON_DEPEND} - dev-util/gdbus-codegen - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-2.6.29 - virtual/pkgconfig[${MULTILIB_USEDEP}] - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - else - return 0 - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - enewgroup plugdev - - use test && python-any-r1_pkg_setup -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - mkdir man || die - find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die - else - # libnl, libndp are only used for executables, not libraries - myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) - fi - - # ifnet plugin always disabled until someone volunteers to actively - # maintain and fix it - # Also disable dhcpcd support as it's also completely unmaintained - # and facing bugs like #563938 and many others - # - # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are - # still not ready for removing that lib - ECONF_SOURCE=${S} \ - runstatedir="/run" \ - gnome2_src_configure \ - --disable-more-warnings \ - --disable-static \ - --localstatedir=/var \ - --disable-lto \ - --disable-config-plugin-ibft \ - --disable-ifnet \ - --disable-qt \ - --without-netconfig \ - --with-dbus-sys-dir=/etc/dbus-1/system.d \ - --with-libnm-glib \ - --with-nmcli=yes \ - --with-udev-dir="$(get_udevdir)" \ - --with-config-plugins-default=keyfile \ - --with-iptables=/sbin/iptables \ - $(multilib_native_with libsoup) \ - $(multilib_native_enable concheck) \ - --with-crypto=$(usex nss nss gnutls) \ - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit upower)) \ - $(multilib_native_use_with audit libaudit) \ - $(multilib_native_use_enable bluetooth bluez5-dun) \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_enable json json-validation) \ - $(multilib_native_use_enable ppp) \ - $(use_with dhclient) \ - --without-dhcpcd \ - $(multilib_native_use_with modemmanager modem-manager-1) \ - $(multilib_native_use_with ncurses nmtui) \ - $(multilib_native_use_with ofono) \ - $(multilib_native_use_with resolvconf) \ - $(multilib_native_use_with selinux) \ - $(multilib_native_use_with systemd systemd-journal) \ - $(multilib_native_use_enable teamd teamdctl) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable vala) \ - --without-valgrind \ - $(multilib_native_use_with wext) \ - $(multilib_native_use_enable wifi) \ - "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in api libnm libnm-util libnm-glib; do - ln -s "${S}"/docs/${d}/html docs/${d}/html || die - done - fi - - # Disable examples - # https://bugzilla.gnome.org/show_bug.cgi?id=769711 - cat > examples/Makefile <<-EOF - .PHONY: all check install - all: - check: - install: - EOF -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - emake all-am - emake -C shared - emake -C introspection # generated headers, needed for libnm - emake -C libnm-core - emake -C libnm - emake -C libnm-util - emake -C libnm-glib - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - else - emake DESTDIR="${D}" install-am - emake DESTDIR="${D}" install -C shared - emake DESTDIR="${D}" install -C introspection - emake DESTDIR="${D}" install -C libnm-core - emake DESTDIR="${D}" install -C libnm - emake DESTDIR="${D}" install -C libnm-util - emake DESTDIR="${D}" install -C libnm-glib - fi -} - -multilib_src_install_all() { - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - # Remove empty /run/NetworkManager - rmdir "${D}"/run/NetworkManager "${D}"/run || die -} - -pkg_postinst() { - gnome2_pkg_postinst - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - 574d0cfa7e911b1f7792077003060240* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.4.2.ebuild b/net-misc/networkmanager/networkmanager-1.4.2.ebuild deleted file mode 100644 index acbac20cac72..000000000000 --- a/net-misc/networkmanager/networkmanager-1.4.2.ebuild +++ /dev/null @@ -1,342 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version - -IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \ -json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \ -systemd teamd test vala +wext +wifi" - -REQUIRED_USE=" - modemmanager? ( ppp ) - vala? ( introspection ) - wext? ( wifi ) - ^^ ( nss gnutls ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -# TODO: need multilib janson (linked to libnm.so) -COMMON_DEPEND=" - >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] - >=dev-libs/libnl-3.2.8:3= - >=sys-auth/polkit-0.106 - net-libs/libndp - >=net-libs/libsoup-2.40:2.4= - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dhcp] - net-firewall/iptables ) - consolekit? ( >=sys-auth/consolekit-1.0.0 ) - dhclient? ( >=net-misc/dhcp-4[client] ) - gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( dev-libs/jansson ) - modemmanager? ( >=net-misc/modemmanager-0.7.991 ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - ofono? ( net-misc/ofono ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - !systemd? ( - !consolekit? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) - ) - teamd? ( >=net-misc/libteam-1.9 ) -" -RDEPEND="${COMMON_DEPEND} - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) -" -DEPEND="${COMMON_DEPEND} - dev-util/gdbus-codegen - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-2.6.29 - virtual/pkgconfig[${MULTILIB_USEDEP}] - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - else - return 0 - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - enewgroup plugdev - - use test && python-any-r1_pkg_setup -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - mkdir man || die - find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die - else - # libnl, libndp are only used for executables, not libraries - myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) - fi - - # ifnet plugin always disabled until someone volunteers to actively - # maintain and fix it - # Also disable dhcpcd support as it's also completely unmaintained - # and facing bugs like #563938 and many others - # - # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are - # still not ready for removing that lib - ECONF_SOURCE=${S} \ - runstatedir="/run" \ - gnome2_src_configure \ - --disable-more-warnings \ - --disable-static \ - --localstatedir=/var \ - --disable-lto \ - --disable-config-plugin-ibft \ - --disable-ifnet \ - --disable-qt \ - --without-netconfig \ - --with-dbus-sys-dir=/etc/dbus-1/system.d \ - --with-libnm-glib \ - --with-nmcli=yes \ - --with-udev-dir="$(get_udevdir)" \ - --with-config-plugins-default=keyfile \ - --with-iptables=/sbin/iptables \ - $(multilib_native_with libsoup) \ - $(multilib_native_enable concheck) \ - --with-crypto=$(usex nss nss gnutls) \ - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit upower)) \ - $(multilib_native_use_with audit libaudit) \ - $(multilib_native_use_enable bluetooth bluez5-dun) \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_enable json json-validation) \ - $(multilib_native_use_enable ppp) \ - $(use_with dhclient) \ - --without-dhcpcd \ - $(multilib_native_use_with modemmanager modem-manager-1) \ - $(multilib_native_use_with ncurses nmtui) \ - $(multilib_native_use_with ofono) \ - $(multilib_native_use_with resolvconf) \ - $(multilib_native_use_with selinux) \ - $(multilib_native_use_with systemd systemd-journal) \ - $(multilib_native_use_enable teamd teamdctl) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable vala) \ - --without-valgrind \ - $(multilib_native_use_with wext) \ - $(multilib_native_use_enable wifi) \ - "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in api libnm libnm-util libnm-glib; do - ln -s "${S}"/docs/${d}/html docs/${d}/html || die - done - fi - - # Disable examples - # https://bugzilla.gnome.org/show_bug.cgi?id=769711 - cat > examples/Makefile <<-EOF - .PHONY: all check install - all: - check: - install: - EOF -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - emake all-am - emake -C shared - emake -C introspection # generated headers, needed for libnm - emake -C libnm-core - emake -C libnm - emake -C libnm-util - emake -C libnm-glib - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - else - emake DESTDIR="${D}" install-am - emake DESTDIR="${D}" install -C shared - emake DESTDIR="${D}" install -C introspection - emake DESTDIR="${D}" install -C libnm-core - emake DESTDIR="${D}" install -C libnm - emake DESTDIR="${D}" install -C libnm-util - emake DESTDIR="${D}" install -C libnm-glib - fi -} - -multilib_src_install_all() { - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - # Remove empty /run/NetworkManager - rmdir "${D}"/run/NetworkManager "${D}"/run || die -} - -pkg_postinst() { - gnome2_pkg_postinst - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - 574d0cfa7e911b1f7792077003060240* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.4.4.ebuild b/net-misc/networkmanager/networkmanager-1.4.4.ebuild index 32e4428a3a14..8e90b83ec634 100644 --- a/net-misc/networkmanager/networkmanager-1.4.4.ebuild +++ b/net-misc/networkmanager/networkmanager-1.4.4.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE=" ^^ ( nss gnutls ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index b5160859c778..432b02588ce6 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Pacho Ramos <pacho@gentoo.org> (15 Jan 2017) +# Missing keywords, bug #559770 +>=net-misc/networkmanager-1.4.4 consolekit + # Pacho Ramos <pacho@gentoo.org> (02 Jan 2017) # Don't keyword redis dev-libs/hiredis test diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 9369c8941f70..5b5925dfcd4b 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Pacho Ramos <pacho@gentoo.org> (15 Jan 2017) +# Missing keywords, bug #559770 +>=net-misc/networkmanager-1.4.4 consolekit + # Justin Lecher <jlec@gentoo.org> (15 Jan 2017) # unkeyworded rev deps dev-games/openscenegraph gdal las diff --git a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild b/www-client/qutebrowser/qutebrowser-0.8.4.ebuild index d6493c3cfca4..58fca1323b9e 100644 --- a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild +++ b/www-client/qutebrowser/qutebrowser-0.8.4.ebuild @@ -66,6 +66,7 @@ pkg_preinst() { } pkg_postinst() { + optfeature "PDF display support" www-plugins/pdfjs fdo-mime_desktop_database_update gnome2_icon_cache_update } diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index d6493c3cfca4..58fca1323b9e 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -66,6 +66,7 @@ pkg_preinst() { } pkg_postinst() { + optfeature "PDF display support" www-plugins/pdfjs fdo-mime_desktop_database_update gnome2_icon_cache_update } diff --git a/www-plugins/pdfjs/Manifest b/www-plugins/pdfjs/Manifest new file mode 100644 index 000000000000..a65cc921fdae --- /dev/null +++ b/www-plugins/pdfjs/Manifest @@ -0,0 +1 @@ +DIST pdfjs-1.6.210.zip 2682332 SHA256 53997edad2635983406a33d99c04db14b139aabbeddc63bc3b6cb60d830a4a90 SHA512 8b19aa6437448de93bb96408abe0db9168aec4452c61ff40329a4c796f0403153fa2e4845e526df3969eca49faebd6095280db03832f5e764077a15af605c35e WHIRLPOOL 5805690672fa5636c9f8a20ac93bb83ae096e22dccd9064ab177dde5df85d66adf775dfd61c562d95349983f7ef39099fb14fcb3aef14a909185baa98fef6510 diff --git a/www-plugins/pdfjs/metadata.xml b/www-plugins/pdfjs/metadata.xml new file mode 100644 index 000000000000..1ce0d7605336 --- /dev/null +++ b/www-plugins/pdfjs/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>hilobakho@gmail.com</email> + <name>Mykyta Holubakha</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Gentoo Proxy Maintainers Project</name> + </maintainer> + <upstream> + <remote-id type="github">mozilla/pdf.js</remote-id> + </upstream> +</pkgmetadata> diff --git a/www-plugins/pdfjs/pdfjs-1.6.210.ebuild b/www-plugins/pdfjs/pdfjs-1.6.210.ebuild new file mode 100644 index 000000000000..c48277e4efde --- /dev/null +++ b/www-plugins/pdfjs/pdfjs-1.6.210.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="A PDF reader in JavaScript" +HOMEPAGE="http://mozilla.github.io/pdf.js/" +SRC_URI="https://github.com/mozilla/pdf.js/releases/download/v${PV}/${P}-dist.zip -> ${P}.zip" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}" + +src_install() { + insinto /usr/share/pdf.js/ + + doins -r build + doins -r web +} diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index 0c22d280a61c..e7d2f83b5316 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -1,3 +1,4 @@ DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6 DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964 DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069 +DIST qwt-6.1.3.tar.bz2 4245614 SHA256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a WHIRLPOOL ebcc43a29bb056d6fc4433a63b07e0dcfa6e09b5581d7ff9d96c09826faec9ea62c1d6d6f3ee2e79859c56df491ee65b29b08cb9a3b0644a0eace3351c4a322c diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r2.ebuild index 4bb636eb3dce..a4f11916e626 100644 --- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild +++ b/x11-libs/qwt/qwt-6.1.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils multibuild multilib qmake-utils @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -SLOT="6" +SLOT="6/1.2" IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg" REQUIRED_USE="|| ( qt4 qt5 )" @@ -144,7 +144,7 @@ src_configure() { ;; esac } - multibuild_parallel_foreach_variant run_in_build_dir configuration + multibuild_foreach_variant run_in_build_dir configuration } src_compile() { @@ -178,11 +178,19 @@ src_install () { if use mathml; then sed \ - -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \ + -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \ -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die fi - use doc && dohtml -r doc/html/* + if use doc; then + dohtml -r doc/html/* + else + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi + + mkdir -p "${ED}"/usr/share/man/ || die + mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ + rmdir "${ED}"/usr/share/doc/${PF}/man || die if use examples; then # don't build examples - fix the qt files to build once installed diff --git a/x11-libs/qwt/qwt-6.1.3.ebuild b/x11-libs/qwt/qwt-6.1.3.ebuild new file mode 100644 index 000000000000..4d78af5e124c --- /dev/null +++ b/x11-libs/qwt/qwt-6.1.3.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils multibuild multilib qmake-utils + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="2D plotting library for Qt4 and Qt5" +HOMEPAGE="http://qwt.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" + +LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +SLOT="6/1.3" +IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg" + +REQUIRED_USE="|| ( qt4 qt5 )" + +DEPEND=" + !<x11-libs/qwt-5.2.3 + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + designer? ( dev-qt/designer:4 ) + opengl? ( dev-qt/qtopengl:4 ) + svg? ( dev-qt/qtsvg:4 ) + ) + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + opengl? ( dev-qt/qtopengl:5 ) + svg? ( dev-qt/qtsvg:5 ) + ) + doc? ( !<media-libs/coin-3.1.3[doc] ) + opengl? ( virtual/opengl ) + " +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MY_P} + +DOCS="README" + +PATCHES=( + "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch + "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch + ) + +src_prepare() { + cat > qwtconfig.pri <<-EOF + QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" + QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" + QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" + QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig + VERSION = ${PV/_*} + QWT_VERSION = ${PV/_*} + EOF + + use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri + use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri + use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri + + cat > qwtbuild.pri <<-EOF + QWT_CONFIG += qt warn_on thread release no_keywords + EOF + + MULTIBUILD_VARIANTS=( ) + + if use qt4; then + use static-libs && MULTIBUILD_VARIANTS+=( qt4-static ) + MULTIBUILD_VARIANTS+=( qt4-shared ) + fi + + if use qt5; then + use static-libs && MULTIBUILD_VARIANTS+=( qt5-static ) + MULTIBUILD_VARIANTS+=( qt5-shared ) + fi + + multibuild_copy_sources + + preparation() { + if [[ ${MULTIBUILD_VARIANT} == *-shared ]]; then + echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri + fi + + case "${MULTIBUILD_VARIANT}" in + qt4-*) + cat >> qwtconfig.pri <<-EOF + QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer" + QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features" + EOF + sed \ + -e 's/target doc/target/' \ + -e "/^TARGET/s:(qwt):(qwt6-qt4):g" \ + -e "/^TARGET/s:qwt):qwt6-qt4):g" \ + -i src/src.pro || die + + sed \ + -e '/qwtAddLibrary/s:(qwt):(qwt6-qt4):g' \ + -e '/qwtAddLibrary/s:qwt):qwt6-qt4):g' \ + -i qwt.prf designer/designer.pro examples/examples.pri \ + textengines/mathml/qwtmathml.prf textengines/textengines.pri || die + + ;; + qt5-*) + cat >> qwtconfig.pri <<-EOF + QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt5/plugins/designer" + QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/features" + EOF + sed \ + -e 's/target doc/target/' \ + -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \ + -e "/^TARGET/s:qwt):qwt6-qt5):g" \ + -i src/src.pro || die + + sed \ + -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \ + -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \ + -i qwt.prf designer/designer.pro examples/examples.pri \ + textengines/mathml/qwtmathml.prf textengines/textengines.pri || die + ;; + esac + epatch "${PATCHES[@]}" + eapply_user + } + + multibuild_foreach_variant run_in_build_dir preparation +} + +src_configure() { + configuration() { + case "${MULTIBUILD_VARIANT}" in + qt4-*) + eqmake4 + ;; + qt5-*) + eqmake5 + ;; + esac + } + multibuild_foreach_variant run_in_build_dir configuration +} + +src_compile() { + multibuild_foreach_variant run_in_build_dir default +} + +src_test() { + testing() { + cd examples || die + case "${MULTIBUILD_VARIANT}" in + qt4-*) + eqmake4 examples.pro + ;; + qt5-*) + eqmake5 examples.pro + ;; + esac + emake + } + multibuild_foreach_variant run_in_build_dir testing +} + +src_install () { + rm -f doc/man/*/{_,deprecated}* || die + + multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install + + if use qt4; then + mv "${ED}"/usr/$(get_libdir)/pkgconfig/qwt6{-qt4,}.pc || die + fi + + if use mathml; then + sed \ + -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \ + -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die + fi + + if use doc; then + dohtml -r doc/html/* + else + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi + + mkdir -p "${ED}"/usr/share/man/ || die + mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ + rmdir "${ED}"/usr/share/doc/${PF}/man || die + + if use examples; then + # don't build examples - fix the qt files to build once installed + cat > examples/examples.pri <<-EOF + include( qwtconfig.pri ) + TEMPLATE = app + MOC_DIR = moc + INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" + DEPENDPATH += "${EPREFIX}/usr/include/qwt6" + LIBS += -lqwt6 + EOF + sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die + cp *.pri examples/ || die + insinto /usr/share/${PN}6 + doins -r examples + fi +} diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest index 5f1e6b28b51a..13df9f9c1467 100644 --- a/x11-wm/stumpwm/Manifest +++ b/x11-wm/stumpwm/Manifest @@ -1 +1,2 @@ DIST stumpwm-0.9.9.tar.gz 189516 SHA256 7dfcb31f3c248a454b892ae98a186f43681f6e8e62b7c77d7858b34f645c0abb SHA512 b114f0dc9091e6704acd4f6d16183b15d956b0f27abec800bca8cfdf966636e7e96c036678fe9c2ca9266d794eabb48c4d66dd62c52c1d26e42ab54abb7ff05b WHIRLPOOL 599bed139c5b058c61b89f01750179f9d9dd5db5fa65737e06f65990c96547042331845aa7d8ce137b0a9357c6e063b6663f7c8c66dab3e74553abedd56b6736 +DIST stumpwm-1.0.0.tar.gz 200794 SHA256 31fcb6fb34af20bf4857bb4621ab4b2c9bd6bec92bfd9ddaf88a18f850ba5dd5 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac WHIRLPOOL 7049299b1c5db42f7379f3f741de8d87e3322deac6787494fb09c553130e0c2c79de93fdcb33beabb80f44f5b29a03f25bc61bfdcb3755043b4937627a3658fc diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild new file mode 100644 index 000000000000..58bfb84dabce --- /dev/null +++ b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit common-lisp-3 eutils elisp-common autotools + +DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." +HOMEPAGE="https://stumpwm.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="contrib doc emacs clisp ecl +sbcl" + +RESTRICT="strip mirror" + +RDEPEND="dev-lisp/cl-ppcre + sbcl? ( >=dev-lisp/sbcl-1.0.32 ) + sbcl? ( >=dev-lisp/clx-0.7.4 ) + !sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) ) + !sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) ) + !sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) ) + emacs? ( virtual/emacs app-emacs/slime )" +DEPEND="${RDEPEND} + sys-apps/texinfo + doc? ( virtual/texi2dvi )" + +SITEFILE=70${PN}-gentoo.el +CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" +CONTRIBDIR="${CLPKGDIR}/contrib" + +get_lisp() { + local lisp + + for lisp in "$@" ; do + use ${lisp} && echo ${lisp} && return + done +} + +do_doc() { + local pdffile="${PN}.pdf" + + texi2pdf -o "${pdffile}" "${PN}.texi" && dodoc "${pdffile}" || die + cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die + dodoc AUTHORS NEWS README.md README.Gentoo + doinfo "${PN}.info" + docinto examples ; dodoc sample-stumpwmrc.lisp +} + +do_contrib() { + emake install-modules + rm -r "${D}${CONTRIBDIR}"/.git* || die +} + +src_prepare() { + default + # Upstream didn't change the version before packaging + sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die + # Bug 534592. Does not build with asdf:oos, using require to load the package + sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die + if use contrib ; then + # Fix contrib directory + sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die + sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die + sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die + fi + eautoreconf +} + +src_configure() { + local moduleconfig + + use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib" + econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}" +} + +src_compile() { + emake -j1 +} + +src_install() { + common-lisp-export-impl-args $(get_lisp sbcl clisp ecl) + dobin stumpwm + make_session_desktop StumpWM /usr/bin/stumpwm + + common-lisp-install-sources *.lisp + common-lisp-install-asdf ${PN}.asd + # Fix ASDF dir + sed -i -e "/(:directory/c\ (:directory \"${CLPKGDIR}\")" \ + "${D}${CLPKGDIR}/load-stumpwm.lisp" || die + use doc && do_doc + use contrib && do_contrib +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |