[gentoo-commits] repo/gentoo:master commit in: x11-misc/screengrab/
commit: b55a3b89d938b403255a86329f364b8e4a5b5d72 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 17:16:25 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 17:17:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b55a3b89 x11-misc/screengrab: version bump Gentoo-bug: 553094 Package-Manager: portage-2.2.20.1 x11-misc/screengrab/Manifest| 1 + x11-misc/screengrab/screengrab-1.2.1.ebuild | 37 + 2 files changed, 38 insertions(+) diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest index 65e448d..0f10856 100644 --- a/x11-misc/screengrab/Manifest +++ b/x11-misc/screengrab/Manifest @@ -1 +1,2 @@ DIST screengrab-1.0.tar.gz 152250 SHA256 40babc5c1afc32e4f413ec56bfd2bf39bdb894ac32465b6cceec21520e60563f SHA512 e34e1fa907ccb105e1b37db40c2dfc22d19b8cdf517a73f4df11f3dffc2cdb0c6ed204d2d1c5bd8efeaa5326f52907fb4b364c84be510d392d7ff882f8d44a7e WHIRLPOOL cefb28f7d4ef29683389e4f4a2e12bb15af049e3c0834f6d53d04650b7b5128090defe5d0849bfdb417e534ccdac12ace73f72a70852f02681a58d35a4032f6b +DIST screengrab-1.2.1.tar.gz 156692 SHA256 48cdaf66e6eff3ef0db89cb09b7c5757f07b99dd1cd05321e33b04a14c670d3b SHA512 12892eaf33fe48875c1d0dccdc631cc64c246ba2ba10432539099b35e75c36f19c8ff8b97dee959575f214ea852d1afaa9cf46476f98e0978b379a05df101805 WHIRLPOOL dc2a41981a7a0b569d0dac55d1bc16531c64e0e2dbe69330a1ff5a6511b28b0e2b6f8330e50805bf5c5b432afa3ac05aab93bfd398a26d8ff729276d6ccb1bfb diff --git a/x11-misc/screengrab/screengrab-1.2.1.ebuild b/x11-misc/screengrab/screengrab-1.2.1.ebuild new file mode 100644 index 000..e3e928b --- /dev/null +++ b/x11-misc/screengrab/screengrab-1.2.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Qt application for getting screenshots" +HOMEPAGE="http://screengrab.doomer.org; +SRC_URI="https://github.com/DOOMer/screengrab/archive/1.2.1.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtcore:4 + dev-qt/qtgui:4 + x11-libs/libX11 +" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i -e "/LICENSE.txt/d" CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSG_DOCDIR=${PF} + ) + + cmake-utils_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: net-im/dianara/
commit: 40ef80d0fd08b05a21ca217310859f6d30b60ac2 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 13:25:45 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 13:26:07 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ef80d0 net-im/dianara: add missing USE dependencies Gentoo-bug: 560624 Package-Manager: portage-2.2.20.1 net-im/dianara/dianara-1.3.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/dianara/dianara-1.3.1.ebuild b/net-im/dianara/dianara-1.3.1.ebuild index 9ff4e3d..37dad4c 100644 --- a/net-im/dianara/dianara-1.3.1.ebuild +++ b/net-im/dianara/dianara-1.3.1.ebuild @@ -17,10 +17,10 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" - >=app-crypt/qca-2.1.0.3:2[qt4] + >=app-crypt/qca-2.1.0.3:2[openssl,qt4] dev-libs/qjson dev-libs/qoauth - dev-qt/qtcore:4 + dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-apps/file"
[gentoo-commits] repo/gentoo:master commit in: net-im/dianara/
commit: c15d52d9d17b0ec9d5967ba8d0ca720a25fa2e97 Author: Julian Ospald gentoo org> AuthorDate: Fri Oct 9 13:47:32 2015 + Commit: Julian Ospald gentoo org> CommitDate: Fri Oct 9 13:47:32 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15d52d9 net-im/dianara: revbump Because 40ef80d0fd08b05a21ca217310859f6d30b60ac2 assumed dynamic dependencies, which is wrong. net-im/dianara/{dianara-1.3.1.ebuild => dianara-1.3.1-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/net-im/dianara/dianara-1.3.1.ebuild b/net-im/dianara/dianara-1.3.1-r1.ebuild similarity index 100% rename from net-im/dianara/dianara-1.3.1.ebuild rename to net-im/dianara/dianara-1.3.1-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 8c75c083a05525b102e9e7944d4544bcb61451af Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 13:08:46 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 13:09:09 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c75c083 profiles: mask dev-libs/libhash for removal profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 463e836..2c30aa9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -31,6 +31,11 @@ #--- END OF EXAMPLES --- # Michael Palimaka=app-crypt/qca-2.1 # Masked for removal in 30 days
[gentoo-commits] repo/gentoo:master commit in: x11-misc/screengrab/
commit: d75e0b756bcdc06b42857f80da845752c086dc69 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 18:26:53 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 18:32:25 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75e0b75 x11-misc/screengrab: unbundle x11-libs/libqxt Gentoo-bug: 562676 Package-Manager: portage-2.2.20.1 .../screengrab/{screengrab-1.2.1.ebuild => screengrab-1.2.1-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x11-misc/screengrab/screengrab-1.2.1.ebuild b/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild similarity index 90% rename from x11-misc/screengrab/screengrab-1.2.1.ebuild rename to x11-misc/screengrab/screengrab-1.2.1-r1.ebuild index e3e928b..39d1f19 100644 --- a/x11-misc/screengrab/screengrab-1.2.1.ebuild +++ b/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild @@ -18,12 +18,14 @@ IUSE="" DEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 + x11-libs/libqxt x11-libs/libX11 " RDEPEND="${DEPEND}" src_prepare() { sed -i -e "/LICENSE.txt/d" CMakeLists.txt || die + rm -r src/3rdparty || die cmake-utils_src_prepare } @@ -31,6 +33,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DSG_DOCDIR=${PF} + -DSG_USE_SYSTEM_QXT=ON ) cmake-utils_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/libkdcraw/
commit: 3f815456ab27d846e6da287b18649c03046b30f3 Author: Andreas Sturmlechner gmail com> AuthorDate: Fri Oct 9 18:18:30 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 18:41:54 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f815456 kde-apps/libkdcraw: Remove any kf5 dependencies See also https://quickgit.kde.org/?p=libkdcraw.git=commit=750bf689076d8e15a88dc89b18294fbfc9238fb3 Package-Manager: portage-2.2.23 kde-apps/libkdcraw/libkdcraw-5..ebuild | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/kde-apps/libkdcraw/libkdcraw-5..ebuild b/kde-apps/libkdcraw/libkdcraw-5..ebuild index 88fc32b..8cdef38 100644 --- a/kde-apps/libkdcraw/libkdcraw-5..ebuild +++ b/kde-apps/libkdcraw/libkdcraw-5..ebuild @@ -7,22 +7,12 @@ EAPI=5 EGIT_BRANCH="frameworks" inherit kde5 -DESCRIPTION="KDE digital camera raw image library wrapper" +DESCRIPTION="Digital camera raw image library wrapper" KEYWORDS="" IUSE="" DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep threadweaver) >=media-libs/libraw-0.16:= dev-qt/qtgui:5 - dev-qt/qtwidgets:5 " RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/files/, media-sound/karlyriceditor/
commit: 8db5c61ec2b1d9d5b37f1b14434f32342b4f0803 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 18:50:13 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 18:51:51 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db5c61e media-sound/karlyriceditor: version bump Package-Manager: portage-2.2.20.1 media-sound/karlyriceditor/Manifest| 1 + .../files/karlyriceditor-1.11-libav.patch | 320 + .../karlyriceditor/karlyriceditor-1.11.ebuild | 37 +++ 3 files changed, 358 insertions(+) diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest index 109d80e..041b2db 100644 --- a/media-sound/karlyriceditor/Manifest +++ b/media-sound/karlyriceditor/Manifest @@ -1,2 +1,3 @@ +DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8 DIST karlyriceditor-1.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 SHA512 23e91e6f950b4f3d5ddaa474380dfd5904bd29f262144df6d587efbba070e1c84bd6d364981e0babb75aa4562c375734b16944817e49ad83ab0c169cf9d2e0e5 WHIRLPOOL d71b7111e2bf57a995acb10de14c39bce37c8f8072936812d8d672540dd22650ce1259cffccecfe6231ca0a3cba87546cd00247247bdc2b6deeb58f2e6c11c10 DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984 diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch new file mode 100644 index 000..6322c07 --- /dev/null +++ b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch @@ -0,0 +1,320 @@ +From: =?utf-8?q?Martin_Stegh=C3=B6fer?=+Date: Tue, 13 Nov 2012 20:19:11 +0100 +Subject: Add missing includes for libavutil +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Author: Martin Steghöfer +Bug: http://sourceforge.net/tracker/?func=detail=3512390_id=290648=1229531 +Forwarded: not-needed + +Added includes necessary for the use of the function "av_rescale_q". +Forwarding to upstream not needed because an equivalent patch has already been +posted to upstream's bug tracker (see URL in the "Bug" field). +--- + src/audioplayerprivate.cpp | 3 +++ + src/ffmpegvideoencoder.cpp | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp +index 90e..1b6b32d 100644 +--- a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp +@@ -21,6 +21,9 @@ + + #include "audioplayer.h" + #include "audioplayerprivate.h" ++extern "C" { ++#include "libavutil/mathematics.h" ++} + #include + + // SDL defines its own main() function in SDL_main. And so does Qt, so if we continue without +diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp +index 5734d2e..49182b5 100644 +--- a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp +@@ -28,6 +28,9 @@ + #include "videoencodingprofiles.h" + #include "audioplayer.h" + #include "audioplayerprivate.h" ++extern "C" { ++#include "libavutil/mathematics.h" ++} + + + #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio +From: =?utf-8?q?Martin_Stegh=C3=B6fer?= +Date: Sat, 12 Apr 2014 15:19:48 +0200 +Subject: Fix compilation: FFmpeg/Libav +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Author: Martin Steghöfer +Forwarded: not-needed + +The upstream developers compile Karlyriceditor against FFmpeg, but in Debian +there is only Libav available, whose API is slowly drifting away from +FFmpeg's. This patch adapts the code to several of those differences: +* The second parameters of "avformat_new_stream" is of non-const pointer + type, but the code tries to pass a const pointer to it. +* There is no AV_ROUND_PASS_MINMAX flag for the rounding parameter of + av_rescale_q_rnd in Libav. +* The member r_frame_rate is no longer present in AVStream. The recommended + replacement is avg_frame_rate. +* The enums CODEC_ID_MP3 and CODEC_ID_AC3 have been prefixed with AV_. +* The function avcodec_alloc_frame was removed in favor of av_frame_alloc. + The corresponding deallocation function is av_frame_free (not the generic + av_free). +--- +
[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/
commit: 500f99c73ce0c8a70a57d2b2baa8b964731a7cae Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 18:50:42 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 18:51:51 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=500f99c7 media-sound/karlyriceditor: remove old Package-Manager: portage-2.2.20.1 media-sound/karlyriceditor/Manifest| 1 - .../karlyriceditor/karlyriceditor-1.3.ebuild | 31 -- 2 files changed, 32 deletions(-) diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest index 041b2db..0f7be28 100644 --- a/media-sound/karlyriceditor/Manifest +++ b/media-sound/karlyriceditor/Manifest @@ -1,3 +1,2 @@ DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8 -DIST karlyriceditor-1.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 SHA512 23e91e6f950b4f3d5ddaa474380dfd5904bd29f262144df6d587efbba070e1c84bd6d364981e0babb75aa4562c375734b16944817e49ad83ab0c169cf9d2e0e5 WHIRLPOOL d71b7111e2bf57a995acb10de14c39bce37c8f8072936812d8d672540dd22650ce1259cffccecfe6231ca0a3cba87546cd00247247bdc2b6deeb58f2e6c11c10 DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984 diff --git a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild deleted file mode 100644 index b9afaa0..000 --- a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit eutils qt4-r2 - -DESCRIPTION="A program which lets you edit and synchronize lyrics with karaoke songs in varions formats" -HOMEPAGE="http://www.karlyriceditor.com/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-libs/openssl:0 - media-libs/libsdl - >=virtual/ffmpeg-0.9 - dev-qt/qtcore:4 - dev-qt/qtgui:4" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-libav.patch" ) - -src_install() { - dodoc Changelog - dobin bin/${PN} - doicon packages/${PN}.png - make_desktop_entry ${PN} 'Karaoke Lyrics Editor' -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/double-conversion/
commit: 474925a36ddb68c2044ac6ca346fe19734db087f Author: Mike Frysinger gentoo org> AuthorDate: Fri Oct 9 16:42:53 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Fri Oct 9 18:53:37 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474925a3 dev-libs/double-conversion: add arm/mips love dev-libs/double-conversion/double-conversion-2.0.1.ebuild | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild index a2a507f..3cf57ca 100644 --- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild +++ b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild @@ -12,12 +12,9 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz; LICENSE="BSD" SLOT="0/1" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" -RDEPEND="" -DEPEND="${RDEPEND}" - S="${WORKDIR}" LIBNAME=lib${PN}
[gentoo-commits] repo/gentoo:master commit in: sys-auth/consolekit/
commit: 790137d7c407dc40e515b8fcb7cc6be0d7614a69 Author: Jason Zaman gentoo org> AuthorDate: Fri Oct 9 18:53:02 2015 + Commit: Jason Zaman gentoo org> CommitDate: Fri Oct 9 18:56:39 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=790137d7 sys-auth/consolekit: Add missing dbus dep Gentoo-Bug: https://bugs.gentoo.org/562674 Package-Manager: portage-2.2.20.1 sys-auth/consolekit/consolekit-1.0.0-r1.ebuild | 116 + 1 file changed, 116 insertions(+) diff --git a/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild new file mode 100644 index 000..3ff36a3 --- /dev/null +++ b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info pam + +MY_PN=ConsoleKit2 +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Framework for defining and tracking users, login sessions and seats" +HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 http://www.freedesktop.org/wiki/Software/ConsoleKit; +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_0.4.6-4.debian.tar.gz" # for logrotate file" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86" +IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test" + +COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus] + >=sys-devel/gettext-0.19 + sys-apps/dbus + sys-libs/zlib:= + x11-libs/libX11:= + acl? ( + sys-apps/acl:= + >=virtual/udev-200 + ) + cgroups? ( + app-admin/cgmanager + >=sys-libs/libnih-1.0.2[dbus] + ) + pam? ( virtual/pam ) + policykit? ( >=sys-auth/polkit-0.110 )" +RDEPEND="${COMMON_DEPEND} + kernel_linux? ( sys-apps/coreutils[acl?] ) + selinux? ( sec-policy/selinux-consolekit )" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + virtual/pkgconfig + doc? ( app-text/xmlto ) + test? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + )" + +S=${WORKDIR}/${MY_P} + +QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*" + +pkg_setup() { + if use kernel_linux; then + # This is from https://bugs.gentoo.org/376939 + use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL" + # This is required to get login-session-id string with pam_ck_connector.so + use pam && CONFIG_CHECK+=" ~AUDITSYSCALL" + linux-info_pkg_setup + fi +} + +src_prepare() { + sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die +} + +src_configure() { + econf \ + XMLTO_FLAGS='--skip-validation' \ + --libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \ + --localstatedir="${EPREFIX}"/var \ + $(use_enable pam pam-module) \ + $(use_enable doc docbook-docs) \ + $(use_enable test docbook-docs) \ + $(use_enable debug) \ + $(use_enable policykit polkit) \ + $(use_enable acl udev-acl) \ + $(use_enable cgroups) \ + $(use_enable test tests) \ + --with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \ + --with-pam-module-dir="$(getpam_mod_dir)" \ + --with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \ + --without-systemdsystemunitdir +} + +src_install() { + emake \ + DESTDIR="${D}" \ + htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + dosym /usr/lib/ConsoleKit /usr/lib/${PN} + + dodoc AUTHORS HACKING NEWS README TODO + + newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit + + keepdir /usr/lib/ConsoleKit/run-seat.d + keepdir /usr/lib/ConsoleKit/run-session.d + keepdir /etc/ConsoleKit/run-session.d + keepdir /var/log/ConsoleKit + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}"/90-consolekit-3 90-consolekit + + prune_libtool_files --all # --all for pam_ck_connector.la + + rm -rf "${ED}"/var/run || die # let the init script create the directory + + insinto /etc/logrotate.d + newins "${WORKDIR}"/debian/${PN}.logrotate ${PN} #374513 +} + +pkg_postinst() { + elog "For suspend/hibernate support, please emerge" + elog " sys-power/pm-utils" +}
[gentoo-commits] proj/catalyst:master commit in: catalyst/
commit: 3c5ef2e76dd5c57b64a160fbfc4b441569d1401e Author: Mike Frysinger gentoo org> AuthorDate: Fri Oct 9 05:29:27 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Fri Oct 9 05:29:27 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3c5ef2e7 log: new logging module to standardize catalyst output This has everything you could ever want: - control where output is sent (stdout or a file) - control over log level - automatic exit when CRITICAL is used - automatic colorization of critical/error/warning messages - explicit control over use of colors - automatic handling of embedded newlines - standardized output format - all logging routed through a single logger (not the root) - additional log level between warning & info: notice This just lays the groundwork -- no code is actually converted over to using this. That will be done in follow up commit(s). Note: The default output level has changed from "info" to "notice". That means the default display won't spam w/irrelevant details. Example output (only the main.py module is converted): $ ./bin/wrapper.py -s test 09 Oct 2015 01:34:56 EDT: NOTICE : Using default Catalyst configuration file: /etc/catalyst/catalyst.conf ContentsMap: __init__(), search_order = ['pixz', 'lbzip2', 'isoinfo_l', 'squashfs', 'gzip', 'xz', 'bzip2', 'tar', 'isoinfo_f'] Creating Portage tree snapshot test from /usr/portage... ^C $ ./bin/wrapper.py -s test --debug 09 Oct 2015 01:35:43 EDT: INFO: main.py:version: Catalyst git 09 Oct 2015 01:35:43 EDT: INFO: main.py:version: vcs version 4440e8908c677d8764e29b0f127e2dd6c02b7621, date Fri Oct 9 01:28:19 2015 -0400 09 Oct 2015 01:35:43 EDT: INFO: main.py:version: Copyright 2003-2015 Gentoo Foundation 09 Oct 2015 01:35:43 EDT: INFO: main.py:version: Copyright 2008-2012 various authors 09 Oct 2015 01:35:43 EDT: INFO: main.py:version: Distributed under the GNU General Public License version 2.1 09 Oct 2015 01:35:43 EDT: NOTICE : log.py:notice: Using default Catalyst configuration file: /etc/catalyst/catalyst.conf 09 Oct 2015 01:35:43 EDT: INFO: main.py:parse_config: Snapshot cache support enabled. 09 Oct 2015 01:35:43 EDT: INFO: main.py:parse_config: Kernel cache support enabled. 09 Oct 2015 01:35:43 EDT: INFO: main.py:parse_config: Autoresuming support enabled. 09 Oct 2015 01:35:43 EDT: INFO: main.py:parse_config: Package cache support enabled. 09 Oct 2015 01:35:43 EDT: INFO: main.py:parse_config: Seed cache support enabled. 09 Oct 2015 01:35:43 EDT: INFO: main.py:parse_config: Envscript support enabled. 09 Oct 2015 01:35:43 EDT: DEBUG : main.py:main: conf_values[options] = set(['snapcache', 'kerncache', 'autoresume', 'pkgcache', 'bindist', 'seedcache']) ^C $ ./bin/wrapper.py -s test -C /asdf 09 Oct 2015 01:36:59 EDT: NOTICE : Using default Catalyst configuration file: /etc/catalyst/catalyst.conf ContentsMap: __init__(), search_order = ['pixz', 'lbzip2', 'isoinfo_l', 'squashfs', 'gzip', 'xz', 'bzip2', 'tar', 'isoinfo_f'] !!! catalyst: Syntax error: 0 09 Oct 2015 01:36:59 EDT: CRITICAL: Could not parse commandline catalyst/log.py | 127 +++ catalyst/main.py | 30 - 2 files changed, 155 insertions(+), 2 deletions(-) diff --git a/catalyst/log.py b/catalyst/log.py new file mode 100644 index 000..871c53c --- /dev/null +++ b/catalyst/log.py @@ -0,0 +1,127 @@ +# Copyright 2003-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +"""Logging related code + +This largely exposes the same interface as the logging module except we add +another level "notice" between warning & info, and all output goes through +the "catalyst" logger. +""" + +from __future__ import print_function + +import logging +import logging.handlers +import os +import sys +import time + + +class CatalystLogger(logging.Logger): + """Override the _log member to autosplit on new lines""" + + def _log(self, level, msg, args, **kwargs): + """If given a multiline message, split it""" + # We have to interpolate it first in case they spread things out + # over multiple lines like: Bad Thing:\n%s\nGoodbye! + msg %= args + for line in msg.splitlines(): + super(CatalystLogger, self)._log(level, line, (), **kwargs) + + +# The logger that all output should go through. +# This is ugly because we want to not perturb the logging module state. +_klass = logging.getLoggerClass() +logging.setLoggerClass(CatalystLogger) +logger = logging.getLogger('catalyst') +logging.setLoggerClass(_klass) +del _klass + + +# Set the notice level between warning and info. +NOTICE = (logging.WARNING + logging.INFO) / 2 +logging.addLevelName(NOTICE, 'NOTICE') + + +# The API we expose to consumers. +def notice(msg, *args, **kwargs): + """Log a notice message""" +
[gentoo-commits] proj/catalyst:master commit in: catalyst/
commit: fd78adf1f2155a76af380a5294954b253f4e1053 Author: Mike Frysinger gentoo org> AuthorDate: Fri Oct 9 05:37:56 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Fri Oct 9 05:37:56 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fd78adf1 main: convert to new logging module catalyst/main.py | 104 +++ 1 file changed, 43 insertions(+), 61 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index adae9a6..f33369b 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -7,6 +7,7 @@ # $Id$ import argparse +import datetime import os import sys @@ -31,36 +32,36 @@ conf_values={} def version(): - print get_version() - print "Copyright 2003-2008 Gentoo Foundation" - print "Copyright 2008-2012 various authors" - print "Distributed under the GNU General Public License version 2.1\n" + log.info(get_version()) + log.info('Copyright 2003-%s Gentoo Foundation', datetime.datetime.now().year) + log.info('Copyright 2008-2012 various authors') + log.info('Distributed under the GNU General Public License version 2.1') def parse_config(myconfig): # search a couple of different areas for the main config file myconf={} config_file="" + default_config_file = '/etc/catalyst/catalyst.conf' # first, try the one passed (presumably from the cmdline) if myconfig: if os.path.exists(myconfig): - print "Using command line specified Catalyst configuration file, "+myconfig + log.notice('Using command line specified Catalyst configuration file: %s', + myconfig) config_file=myconfig else: - print "!!! catalyst: Could not use specified configuration file "+\ - myconfig - sys.exit(1) + log.critical('Specified configuration file does not exist: %s', myconfig) # next, try the default location - elif os.path.exists("/etc/catalyst/catalyst.conf"): - print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf" - config_file="/etc/catalyst/catalyst.conf" + elif os.path.exists(default_config_file): + log.notice('Using default Catalyst configuration file: %s', + default_config_file) + config_file = default_config_file # can't find a config file (we are screwed), so bail out else: - print "!!! catalyst: Could not find a suitable configuration file" - sys.exit(1) + log.critical('Could not find a suitable configuration file') # now, try and parse the config file "config_file" try: @@ -69,8 +70,7 @@ def parse_config(myconfig): myconf.update(myconfig.get_values()) except Exception: - print "!!! catalyst: Unable to parse configuration file, "+myconfig - sys.exit(1) + log.critical('Could not find parse configuration file: %s', myconfig) # now, load up the values into conf_values so that we can use them for x in list(confdefaults): @@ -90,7 +90,7 @@ def parse_config(myconfig): # print out any options messages for opt in conf_values['options']: if opt in option_messages: - print option_messages[opt] + log.info(option_messages[opt]) for key in ["digests", "envscript", "var_tmpfs_portage", "port_logdir", "local_overlay"]: @@ -102,7 +102,7 @@ def parse_config(myconfig): conf_values["contents"] = myconf["contents"].replace("-", '_') if "envscript" in myconf: - print "Envscript support enabled." + log.info('Envscript support enabled.') # take care of any variable substitutions that may be left for x in list(conf_values): @@ -118,11 +118,8 @@ def import_module(target): try: mod_name = "catalyst.targets." + target module = __import__(mod_name, [],[], ["not empty"]) - except ImportError as e: - print "!!! catalyst: Python module import error: %s " % target + \ - "in catalyst/targets/ ... exiting." - print "ERROR was: ", e - sys.exit(1) + except ImportError: + log.critical('Python module import error: %s', target, exc_info=True) return module @@ -278,7 +275,7 @@ def main(): parse_config(myconfig) conf_values["options"].update(options) - #print "MAIN: conf_values['options'] =", conf_values["options"] + log.debug('conf_values[options] = %s', conf_values['options'])
[gentoo-commits] proj/catalyst:master commit in: catalyst/
commit: 0c931533d9ad82c4c724e7de25db07851cea2f66 Author: Mike Frysinger gentoo org> AuthorDate: Fri Oct 9 03:31:03 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Fri Oct 9 03:31:03 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0c931533 main: group related command line flags This makes the --help output more manageable so people can quickly scan and skip options that they don't care about. catalyst/main.py | 48 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index 03c13c0..e6b6447 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -168,41 +168,49 @@ Using the specfile option (-f, --file) to build a stage target: $ catalyst -f stage1-specfile.spec""" parser = argparse.ArgumentParser(epilog=epilog, formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('-d', '--debug', + + parser.add_argument('-V', '--version', + action='version', version=get_version(), + help='display version information') + + group = parser.add_argument_group('Program output options') + group.add_argument('-d', '--debug', default=False, action='store_true', help='enable debugging') - parser.add_argument('-v', '--verbose', + group.add_argument('-v', '--verbose', default=False, action='store_true', help='verbose output') - parser.add_argument('-c', '--config', - type=FilePath(), - help='use specified configuration file') - parser.add_argument('-f', '--file', - type=FilePath(), - help='read specfile') - parser.add_argument('-F', '--fetchonly', - default=False, action='store_true', - help='fetch files only') - parser.add_argument('-a', '--clear-autoresume', + + group = parser.add_argument_group('Temporary file management') + group.add_argument('-a', '--clear-autoresume', default=False, action='store_true', help='clear autoresume flags') - parser.add_argument('-p', '--purge', + group.add_argument('-p', '--purge', default=False, action='store_true', help='clear tmp dirs, package cache, autoresume flags') - parser.add_argument('-P', '--purgeonly', + group.add_argument('-P', '--purgeonly', default=False, action='store_true', help='clear tmp dirs, package cache, autoresume flags and exit') - parser.add_argument('-T', '--purgetmponly', + group.add_argument('-T', '--purgetmponly', default=False, action='store_true', help='clear tmp dirs and autoresume flags and exit') - parser.add_argument('-s', '--snapshot', + + group = parser.add_argument_group('Target/config file management') + group.add_argument('-F', '--fetchonly', + default=False, action='store_true', + help='fetch files only') + group.add_argument('-c', '--config', + type=FilePath(), + help='use specified configuration file') + group.add_argument('-f', '--file', + type=FilePath(), + help='read specfile') + group.add_argument('-s', '--snapshot', help='generate a release snapshot') - parser.add_argument('-V', '--version', - action='version', version=get_version(), - help='display version information') - parser.add_argument('-C', '--cli', + group.add_argument('-C', '--cli', default=[], nargs=argparse.REMAINDER, help='catalyst commandline (MUST BE LAST OPTION)') + return parser
[gentoo-commits] repo/gentoo:master commit in: media-sound/musique/files/, media-sound/musique/
commit: 2f9b36011ada0104883275fad335084922f5c9c6 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 14:40:56 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 14:42:22 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9b3601 media-sound/musique: version bump Package-Manager: portage-2.2.20.1 media-sound/musique/Manifest | 1 + .../musique-1.4-unbundle-qtsingleapplication.patch | 13 + media-sound/musique/musique-1.3.ebuild | 6 ++ .../musique/{musique-1.3.ebuild => musique-1.4.ebuild} | 18 -- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest index e22fbb7..a5fe32a 100644 --- a/media-sound/musique/Manifest +++ b/media-sound/musique/Manifest @@ -1,2 +1,3 @@ DIST musique-1.2.1.tar.gz 374601 SHA256 cc0f626d7de981ff7fdd776fb9eab6a7750443ad55f6978132d9c9d11abd1f38 SHA512 b6d52d8345c69e5b4bfa6419cab4baeb5ed1c81106fbe98b74943cc4c6aa0712444e2189605132da2a2362d38de322926eb3f6ef0b8f25bb45e3e86e3b74cd33 WHIRLPOOL 775751a857dd2e4fbc1f9e50dea9ed0c9d40edd8af7c1bc0a9c7eb186aad39680760825b5c04bbc439d9ac98682952cf5fc2d8e8db595e0f0a99125e6112a078 DIST musique-1.3.tar.gz 399750 SHA256 401643ad9c750270a89d431806044c626dee3fe7ebc14d0ac72917197cdd0592 SHA512 eb197c315b77d4053960c8c18d012635f957eb9ae89bb8b576f938013db43f78ab0d5a0fe0d46fb32cc9f398f9d7f96a37cf975b2f192a6cbc3dd294c4cad279 WHIRLPOOL b4a48d2e8d57d3cfb6cb3d705b4cccbbaf9ae642f16864bb9c61ece02e658b941472a2767d82218c5bf36031af52354fd2868014d8af0a4b2bb71abdf96f3e6e +DIST musique-1.4.tar.gz 390031 SHA256 08dfb4201aa0edc4b3fe4ef7788e618f754c3921f3a7c1cdce40ef3999760670 SHA512 0ecc7cf1038880fc302602967cd7563641310cbe19fe2394e8ce2c03562f5e336bfc76e1ea18b026c2602b11cfe278a106bc9b3b2dd625d7e70db0da57985a68 WHIRLPOOL 8185dcbe0559b34d3f8e7b93498312c375412faa83eed01a1faaabfb979672cb78969d2965251aa63bd2e38477654575e52d8a760fe186e39398efc08e36 diff --git a/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch new file mode 100644 index 000..ddd5242 --- /dev/null +++ b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch @@ -0,0 +1,13 @@ +Use system copy of qtsingleapplication. + +--- musique.pro musique.pro +@@ -16,7 +16,7 @@ + TARGET = $${APP_UNIX_NAME} + + QT += network xml sql +-include(src/qtsingleapplication/qtsingleapplication.pri) ++CONFIG += qtsingleapplication + + HEADERS += src/mainwindow.h \ + src/aboutview.h \ diff --git a/media-sound/musique/musique-1.3.ebuild b/media-sound/musique/musique-1.3.ebuild index 5cf7db1..a78c81b 100644 --- a/media-sound/musique/musique-1.3.ebuild +++ b/media-sound/musique/musique-1.3.ebuild @@ -17,8 +17,10 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" + dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4[gtkstyle] + dev-qt/qtsingleapplication[qt4] dev-qt/qtsql:4[sqlite] || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] ) media-libs/taglib @@ -30,10 +32,6 @@ S="${WORKDIR}/${PN}" DOCS="CHANGES TODO" src_prepare () { - # bug 422665. Upstream only cares about ubuntu - # so this bug will be fixed once ubuntu moves - # to gcc-4.7. No, I will not send this patch upstream - # *again* epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch qt4-r2_src_prepare } diff --git a/media-sound/musique/musique-1.3.ebuild b/media-sound/musique/musique-1.4.ebuild similarity index 58% copy from media-sound/musique/musique-1.3.ebuild copy to media-sound/musique/musique-1.4.ebuild index 5cf7db1..6e40cbb 100644 --- a/media-sound/musique/musique-1.3.ebuild +++ b/media-sound/musique/musique-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,8 +8,7 @@ inherit eutils qt4-r2 DESCRIPTION="Qt4 music player" HOMEPAGE="http://flavio.tordini.org/musique; -# Same tarball for every release. We repackage it -SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz; +SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz; LICENSE="GPL-3" SLOT="0" @@ -17,8 +16,10 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" + dev-qt/qtcore:4 dev-qt/qtdbus:4 - dev-qt/qtgui:4[gtkstyle] + dev-qt/qtgui:4 + dev-qt/qtsingleapplication[qt4,X] dev-qt/qtsql:4[sqlite] || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] ) media-libs/taglib @@ -27,14 +28,11 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}" -DOCS="CHANGES TODO" +DOCS=( CHANGES TODO ) src_prepare () { - # bug 422665. Upstream only cares about ubuntu - # so this bug will be fixed once ubuntu moves - # to gcc-4.7. No, I will not send this patch upstream -
[gentoo-commits] repo/gentoo:master commit in: media-sound/musique/
commit: 5647dacabe0410335d11c24f6f31e1f09c7aac91 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 14:41:58 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 14:42:23 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5647daca media-sound/musique: remove old Package-Manager: portage-2.2.20.1 media-sound/musique/Manifest | 1 - media-sound/musique/musique-1.2.1.ebuild | 48 2 files changed, 49 deletions(-) diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest index a5fe32a..971fe7e 100644 --- a/media-sound/musique/Manifest +++ b/media-sound/musique/Manifest @@ -1,3 +1,2 @@ -DIST musique-1.2.1.tar.gz 374601 SHA256 cc0f626d7de981ff7fdd776fb9eab6a7750443ad55f6978132d9c9d11abd1f38 SHA512 b6d52d8345c69e5b4bfa6419cab4baeb5ed1c81106fbe98b74943cc4c6aa0712444e2189605132da2a2362d38de322926eb3f6ef0b8f25bb45e3e86e3b74cd33 WHIRLPOOL 775751a857dd2e4fbc1f9e50dea9ed0c9d40edd8af7c1bc0a9c7eb186aad39680760825b5c04bbc439d9ac98682952cf5fc2d8e8db595e0f0a99125e6112a078 DIST musique-1.3.tar.gz 399750 SHA256 401643ad9c750270a89d431806044c626dee3fe7ebc14d0ac72917197cdd0592 SHA512 eb197c315b77d4053960c8c18d012635f957eb9ae89bb8b576f938013db43f78ab0d5a0fe0d46fb32cc9f398f9d7f96a37cf975b2f192a6cbc3dd294c4cad279 WHIRLPOOL b4a48d2e8d57d3cfb6cb3d705b4cccbbaf9ae642f16864bb9c61ece02e658b941472a2767d82218c5bf36031af52354fd2868014d8af0a4b2bb71abdf96f3e6e DIST musique-1.4.tar.gz 390031 SHA256 08dfb4201aa0edc4b3fe4ef7788e618f754c3921f3a7c1cdce40ef3999760670 SHA512 0ecc7cf1038880fc302602967cd7563641310cbe19fe2394e8ce2c03562f5e336bfc76e1ea18b026c2602b11cfe278a106bc9b3b2dd625d7e70db0da57985a68 WHIRLPOOL 8185dcbe0559b34d3f8e7b93498312c375412faa83eed01a1faaabfb979672cb78969d2965251aa63bd2e38477654575e52d8a760fe186e39398efc08e36 diff --git a/media-sound/musique/musique-1.2.1.ebuild b/media-sound/musique/musique-1.2.1.ebuild deleted file mode 100644 index 5cf7db1..000 --- a/media-sound/musique/musique-1.2.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils qt4-r2 - -DESCRIPTION="Qt4 music player" -HOMEPAGE="http://flavio.tordini.org/musique; -# Same tarball for every release. We repackage it -SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtdbus:4 - dev-qt/qtgui:4[gtkstyle] - dev-qt/qtsql:4[sqlite] - || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] ) - media-libs/taglib -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}" - -DOCS="CHANGES TODO" - -src_prepare () { - # bug 422665. Upstream only cares about ubuntu - # so this bug will be fixed once ubuntu moves - # to gcc-4.7. No, I will not send this patch upstream - # *again* - epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch - qt4-r2_src_prepare -} - -src_configure() { - eqmake4 ${PN}.pro PREFIX="/usr" -} - -src_install() { - qt4-r2_src_install - doicon data/${PN}.svg -}
[gentoo-commits] repo/gentoo:master commit in: media-sound/musique/
commit: 22037fe3e2d894bc8e3113bb2ba67e484c53e490 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 9 14:44:35 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 9 14:45:15 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22037fe3 media-sound/musique: revert accidental changes Package-Manager: portage-2.2.20.1 media-sound/musique/musique-1.3.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-sound/musique/musique-1.3.ebuild b/media-sound/musique/musique-1.3.ebuild index a78c81b..5cf7db1 100644 --- a/media-sound/musique/musique-1.3.ebuild +++ b/media-sound/musique/musique-1.3.ebuild @@ -17,10 +17,8 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" - dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4[gtkstyle] - dev-qt/qtsingleapplication[qt4] dev-qt/qtsql:4[sqlite] || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] ) media-libs/taglib @@ -32,6 +30,10 @@ S="${WORKDIR}/${PN}" DOCS="CHANGES TODO" src_prepare () { + # bug 422665. Upstream only cares about ubuntu + # so this bug will be fixed once ubuntu moves + # to gcc-4.7. No, I will not send this patch upstream + # *again* epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch qt4-r2_src_prepare }
[gentoo-commits] repo/gentoo:master commit in: x11-wm/jwm/
commit: 9a94bb3a771b84ec44d2359aa9af6e2fe9e9433d Author: Ian Delaney gentoo org> AuthorDate: Fri Oct 9 14:43:33 2015 + Commit: Ian Delaney gentoo org> CommitDate: Fri Oct 9 14:44:52 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a94bb3a x11-wm/jwm: bump to -2.3.2 patch to bump submitted in gentoo bug by 'wraeth' added as proxy maintainer under the proxy-maintainers herd in metadata Gentoo bug: #562462 Package-Manager: portage-2.2.20.1 x11-wm/jwm/Manifest | 1 + x11-wm/jwm/jwm-2.3.2.ebuild | 66 + x11-wm/jwm/metadata.xml | 7 - 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest index e42995b..ba894dd 100644 --- a/x11-wm/jwm/Manifest +++ b/x11-wm/jwm/Manifest @@ -1 +1,2 @@ DIST jwm-2.1.0.tar.bz2 163590 SHA256 5c99f9023dc8c2597effdaacc240ff4c2e07e77c8244f3bf1de5cc483bcf08ab SHA512 68476ce1e57486110301582e7a42e709d8113634736063915b1e5ed8351187095f3dcafdc3194839a405959c0b7d5c10f31ae420ee54ce8d857e300194388c1e WHIRLPOOL 68a958e1384ce4a7c28a41ae239b44eaf509ece13d9f2630abf72c39a96670d0abd4aa45c9f47957655f6fd87ac8505c5694c253d2b3480537ca344324c319a6 +DIST jwm-2.3.2.tar.xz 325648 SHA256 92a3e66ceb847aac9fa09a24b16c93194f6c52e398f5a88f228b4986ea972c53 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27 WHIRLPOOL 93d140919edf16fb44bf93b0d017174036de363a514862c5553ea84796311ba74fa2f6736fa2f78fe639e95ad6087b38fa962d77c83c4c4d863e35c06703 diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild new file mode 100644 index 000..6263aef --- /dev/null +++ b/x11-wm/jwm/jwm-2.3.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit eutils + +DESCRIPTION="Very fast and lightweight still powerful window manager for X" +HOMEPAGE="http://joewing.net/programs/jwm/; +SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd" +IUSE="bidi debug jpeg png truetype xinerama xpm" + +RDEPEND="xpm? ( x11-libs/libXpm ) + xinerama? ( x11-libs/libXinerama ) + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXau + x11-libs/libXdmcp + truetype? ( x11-libs/libXft ) + png? ( media-libs/libpng ) + jpeg? ( virtual/jpeg ) + bidi? ( dev-libs/fribidi ) + dev-libs/expat" +DEPEND="${RDEPEND} + x11-proto/xproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto )" + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable jpeg) \ + $(use_enable png) \ + $(use_enable truetype xft) \ + $(use_enable xinerama) \ + $(use_enable xpm) \ + $(use_enable bidi fribidi) \ + --enable-shape \ + --enable-xrender +} + +src_install() { + dodir /usr/bin + dodir /etc + dodir /usr/share/man + emake BINDIR="${D}/usr/bin" SYSCONF="${D}/etc" \ + MANDIR="${D}/usr/share/man" install + rm "${D}"/etc/system.jwmrc + + echo "#!/bin/sh" > jwm + echo "exec /usr/bin/jwm" >> jwm + exeinto /etc/X11/Sessions + doexe jwm + + dodoc README.md example.jwmrc ChangeLog +} + +pkg_postinst() { + einfo "Put an appropriate configuration file in /etc/system.jwmrc" + einfo "or in ~/.jwmrc." + einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/" +} diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml index 4538a68..986da1c 100644 --- a/x11-wm/jwm/metadata.xml +++ b/x11-wm/jwm/metadata.xml @@ -1,5 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> -maintainer-nee...@gentoo.org + proxy-maintainers + + wra...@wraeth.id.au + Sam Jorna + Proxy maintainer for assignee of bugs +
[gentoo-commits] repo/gentoo:master commit in: app-laptop/samsung-tools/
commit: 98e12c120474c509b247cdc95a98322bda50696c Author: Ian Delaney gentoo org> AuthorDate: Fri Oct 9 14:53:02 2015 + Commit: Ian Delaney gentoo org> CommitDate: Fri Oct 9 14:54:08 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e12c12 app-laptop/samsung-tools: set proxy maintainer undersys in metadata Package-Manager: portage-2.2.20.1 app-laptop/samsung-tools/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-laptop/samsung-tools/metadata.xml b/app-laptop/samsung-tools/metadata.xml index f80fe72..6ca6fbc 100644 --- a/app-laptop/samsung-tools/metadata.xml +++ b/app-laptop/samsung-tools/metadata.xml @@ -1,8 +1,11 @@ http://www.gentoo.org/dtd/metadata.dtd;> + proxy-maintainers - maintainer-nee...@gentoo.org + bren...@horan.hk + Brendan Horan + Proxy maintainer for assignee of bugs samsung-tools
[gentoo-commits] proj/portage:master commit in: /
commit: 39cc561ed9989798f78eacf42052ff276da1497b Author: Brian Dolbec gentoo org> AuthorDate: Thu Oct 8 01:43:51 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Oct 8 01:43:51 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=39cc561e Updates for a release RELEASE-NOTES | 14 ++ setup.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index b26ba20..11b18a9 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,6 +1,20 @@ Release Notes; upgrade information mainly. Features/major bugfixes are listed in NEWS +portage-2.2.23 +== +* Bug Fixes: +- Bug 561474 Add check that we need commit signing +- Bug 561596 Fix typo in function call +- Bug 561264 AbstractEbuildProcess: remove cgroup with release_agent + SyncRepos.async: group sync and callback as composite task +- Bug 554084 unpack: use chmod-lite helper +- Bug 562108 repoman/argparser.py: _unicode_decode the commitmsg +- Bug 561846 dohtml: handle unicode +- Bug 534022 scanner.py: Fix options.output_style for column output +* Add icecream feature support + + portage-2.2.22 == * Bug Fixes: diff --git a/setup.py b/setup.py index ec43cfd..fda95db 100755 --- a/setup.py +++ b/setup.py @@ -612,7 +612,7 @@ def get_manpages(): setup( name = 'portage', - version = '2.2.22', + version = '2.2.23', url = 'https://wiki.gentoo.org/wiki/Project:Portage', author = 'Gentoo Portage Development Team', author_email = 'dev-port...@gentoo.org',
[gentoo-commits] proj/portage: New tag: v2.2.23
commit: Commit: Brian Dolbec gentoo org> CommitDate: Fri Oct 9 15:01:04 2015 + New tag: v2.2.23
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: c38770f58b278dce35b82a3d45a134f69d4b8926 Author: Richard Yao gentoo org> AuthorDate: Fri Oct 9 15:30:30 2015 + Commit: Richard Yao gentoo org> CommitDate: Fri Oct 9 15:31:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38770f5 sys-fs/zfs: Only check kernel sources with USE=test-suite Package-Manager: portage-2.2.20.1 Reported-by: Yixun Lan gentoo.org> Signed-off-by: Richard Yao gentoo.org> sys-fs/zfs/zfs-0.6.5.2-r1.ebuild | 2 +- sys-fs/zfs/zfs-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild index 83049e7..d8d2c64 100644 --- a/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild @@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND} " pkg_setup() { - if use kernel_linux; then + if use kernel_linux && use test-suite; then linux-info_pkg_setup if ! linux_config_exists; then ewarn "Cannot check the linux kernel configuration." diff --git a/sys-fs/zfs/zfs-.ebuild b/sys-fs/zfs/zfs-.ebuild index 54dd341..8bb60aa 100644 --- a/sys-fs/zfs/zfs-.ebuild +++ b/sys-fs/zfs/zfs-.ebuild @@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND} " pkg_setup() { - if use kernel_linux; then + if use kernel_linux && use test-suite; then linux-info_pkg_setup if ! linux_config_exists; then ewarn "Cannot check the linux kernel configuration."
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
commit: ee45de5071bd59360f0254490fddba68edd9d875 Author: Richard Yao gentoo org> AuthorDate: Fri Oct 9 15:34:57 2015 + Commit: Richard Yao gentoo org> CommitDate: Fri Oct 9 15:34:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee45de50 sys-fs/zfs: Remove outdated ebuilds Package-Manager: portage-2.2.20.1 Signed-off-by: Richard Yao gentoo.org> sys-fs/zfs/Manifest | 7 -- sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild | 123 -- sys-fs/zfs/zfs-0.6.2-r1.ebuild | 152 sys-fs/zfs/zfs-0.6.2-r2.ebuild | 152 sys-fs/zfs/zfs-0.6.2-r3.ebuild | 152 sys-fs/zfs/zfs-0.6.2-r4.ebuild | 153 sys-fs/zfs/zfs-0.6.2.ebuild | 142 -- sys-fs/zfs/zfs-0.6.3.ebuild | 142 -- sys-fs/zfs/zfs-0.6.4.ebuild | 143 -- sys-fs/zfs/zfs-0.6.5.ebuild | 171 10 files changed, 1337 deletions(-) diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 9294320..4585748 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,15 +1,8 @@ -DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58 DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50 DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1 -DIST zfs-0.6.4.tar.gz 1735736 SHA256 7f371fc15201dde58bb84e0f191ccac462f19ffec0c889b6f6ed3f73a804 SHA512 cf47cbf5fa8dff75f5e9d81b323f5745d7b210266ba9e6ccab16bbf0e2b055aa1168bad94a77a4bc56c6fbe0391593f210bd4c74f7a8d0d99385ac4dd61e5622 WHIRLPOOL 1b0cc8a9727b57f2e63bd106cd94780002a068b31668b9dc103dbc0b48858a380d7c228f39f0526fc84b9d10aca1bd376ace0346a2ef4306a9d164c2d56606f1 DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb30146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634 -DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/spl/
commit: efd37c7a25be766205a625ca084b3afae1969e6d Author: Richard Yao gentoo org> AuthorDate: Fri Oct 9 15:39:40 2015 + Commit: Richard Yao gentoo org> CommitDate: Fri Oct 9 15:39:40 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd37c7a sys-kernel/spl: Remove outdated ebuilds Package-Manager: portage-2.2.20.1 Signed-off-by: Richard Yao gentoo.org> sys-kernel/spl/spl-0.6.2-r1.ebuild | 113 --- sys-kernel/spl/spl-0.6.2-r2.ebuild | 113 --- sys-kernel/spl/spl-0.6.2-r3.ebuild | 113 --- sys-kernel/spl/spl-0.6.2-r4.ebuild | 113 --- sys-kernel/spl/spl-0.6.2.ebuild| 110 -- sys-kernel/spl/spl-0.6.3.ebuild| 117 - sys-kernel/spl/spl-0.6.4.ebuild| 114 sys-kernel/spl/spl-0.6.5.ebuild| 114 8 files changed, 907 deletions(-) diff --git a/sys-kernel/spl/spl-0.6.2-r1.ebuild b/sys-kernel/spl/spl-0.6.2-r1.ebuild deleted file mode 100644 index 68021bc..000 --- a/sys-kernel/spl/spl-0.6.2-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -AUTOTOOLS_AUTORECONF="1" - -inherit flag-o-matic linux-info linux-mod autotools-utils - -if [[ ${PV} == "" ]] ; then - inherit git-2 - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz - https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p0.tar.xz; - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs" -HOMEPAGE="http://zfsonlinux.org/; - -LICENSE="GPL-2" -SLOT="0" -IUSE="custom-cflags debug debug-log" -RESTRICT="test" - -COMMON_DEPEND="dev-lang/perl - virtual/awk" - -DEPEND="${COMMON_DEPEND}" - -RDEPEND="${COMMON_DEPEND} - !sys-devel/spl" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - !GRKERNSEC_HIDESYM - MODULES - KALLSYMS - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" - - [ ${PV} != "" ] && \ - { kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Workaround for hard coded path - sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die - - if [ ${PV} != "" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${PN}-${MY_PV}-patches" - fi - - # splat is unnecessary unless we are debugging - use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=all - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - $(use_enable debug-log) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - dodoc AUTHORS DISCLAIMER README.markdown -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi -} diff --git a/sys-kernel/spl/spl-0.6.2-r2.ebuild b/sys-kernel/spl/spl-0.6.2-r2.ebuild deleted file mode 100644 index 0482412..000 --- a/sys-kernel/spl/spl-0.6.2-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
commit: 050bf38afc93a98c5176c95b3c4ffc01212bf46b Author: Richard Yao gentoo org> AuthorDate: Fri Oct 9 15:38:56 2015 + Commit: Richard Yao gentoo org> CommitDate: Fri Oct 9 15:38:56 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=050bf38a sys-fs/zfs-kmod: Remove outdated ebuilds Package-Manager: portage-2.2.20.1 Signed-off-by: Richard Yao gentoo.org> sys-fs/zfs-kmod/zfs-kmod-0.6.2-r4.ebuild | 129 --- sys-fs/zfs-kmod/zfs-kmod-0.6.2-r5.ebuild | 129 --- sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild| 138 - sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild| 142 -- sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild | 146 --- 5 files changed, 684 deletions(-) diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r4.ebuild deleted file mode 100644 index 9bbb3fd..000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r4.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -if [ ${PV} == "" ] ; then - inherit git-2 - MY_PV= - EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git" -else - inherit eutils versionator - MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz - https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p3.tar.xz; - S="${WORKDIR}/zfs-zfs-${MY_PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/; - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - BLK_DEV_LOOP - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD - DEVTMPFS" - - kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" - - [ ${PV} != "" ] && \ - { kernel_is le 3 14 || die "Linux 3.14 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - if [ ${PV} != "" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${PN}-${MY_PV}-patches" - fi - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" - fi - - if use x86 || use arm - then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of ZFSOnLinux includes support for features flags." - ewarn "If you upgrade your pools to make use of feature flags, you will lose" - ewarn "the ability to import them using older versions of ZFSOnLinux." - ewarn "Any new pools will be created with feature flag support and