diff options
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/packagekit/Manifest | 7 | ||||
| -rw-r--r-- | app-admin/packagekit/metadata.xml | 13 | ||||
| -rw-r--r-- | app-admin/packagekit/packagekit-0.6.6.ebuild (renamed from app-admin/packagekit/packagekit-0.6.2.ebuild) | 126 | ||||
| -rw-r--r-- | app-admin/packagekit/packagekit-9999.ebuild | 231 |
4 files changed, 54 insertions, 323 deletions
diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest index cd29038be3..2a037801c1 100644 --- a/app-admin/packagekit/Manifest +++ b/app-admin/packagekit/Manifest @@ -1,4 +1,3 @@ -DIST PackageKit-0.6.2.tar.gz 9358171 RMD160 593c7d1281a35c3a724bf6d3b4cc2938928465b5 SHA1 439758a1b5a3443d0db94a7c49eccf090e00ca53 SHA256 31426cf7854e926207e229990a8f2ce08bea53f4713d75390e73e8e13bdfadaf -EBUILD packagekit-0.6.2.ebuild 5210 RMD160 47d70ef607abdf580659865ef12cac7c061f3340 SHA1 4d64000c77ce2c4bd4e30b28ed5757067f8530aa SHA256 b0947ab63f252e337e3afec2aff89e38b2365506a1a8629a6bf632acc435f313 -EBUILD packagekit-9999.ebuild 6044 RMD160 8c667a8fa8c0548d081876e1c119e7496072ba96 SHA1 b2371b97222102a82404d2e6118b25836163a82a SHA256 67d6be14b93cad894eba6dc413af5466fdc75a49f44fd9999937a53ea5ded487 -MISC metadata.xml 882 RMD160 e3d03ab9e72e25b4bcd079b0f389bd63c01055ea SHA1 92ddaaf4f07da27733070dd82be5c75033aa1c7f SHA256 f1b730f28e73eb25ee235bbed4b7b9205e9e27eda2eed3ff30eccb318cf935d3 +DIST PackageKit-0.6.6.tar.gz 9401600 RMD160 cf785c21835292abc97ec8a4dfdceaff877f19fb SHA1 4c88dc3efad0b5aac67676fdb6fbc21084e5a75d SHA256 29b5aad5006c287088d14f311a946ed77fce16861f519fbb65a2cd99dff700b1 +EBUILD packagekit-0.6.6.ebuild 4055 RMD160 c7b4e268d4c6435892b01f729ec2195924318b85 SHA1 0232fa4af4dd2872ccba6a9eee3ebaa9db448740 SHA256 e58db0572954d72d853d26611745e5b65f139644c50f3d7cb957fe315dd7f092 +MISC metadata.xml 706 RMD160 1081be74743bb4b9bb6ddcddb917285c79cc4517 SHA1 5056ed8801fb18baf17ae4a3b4908f87df2c74f2 SHA256 5d98e8cf76d5685c7fda80dab7daebb238e63b6ff5edde62f79773d4d03ceae4 diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml index f16d2c9bb5..2201619397 100644 --- a/app-admin/packagekit/metadata.xml +++ b/app-admin/packagekit/metadata.xml @@ -8,20 +8,11 @@ </maintainer> <use> <flag name="connman">Add support for <pkg>net-misc/connman</pkg></flag> - <flag name="consolekit"> - Use <pkg>sys-auth/consolekit</pkg> to determine proxy settings - </flag> <flag name="cron">Install cron script for auto-update</flag> - <flag name="portage"> - Enable Portage backend - </flag> - <flag name="entropy"> - Enable Entropy backend (Sabayon system pkg) - </flag> + <flag name="portage">Enable Portage backend</flag> + <flag name="entropy">Enable Entropy backend (Sabayon system pkg)</flag> <flag name="pm-utils">Use pm-utils</flag> <!--flag name="ruck">Build ruck (rug-like) client</flag--> - <flag name="static-libs">Compile static archives</flag> <flag name="udev">Add support for <pkg>sys-fs/udev</pkg></flag> </use> </pkgmetadata> - diff --git a/app-admin/packagekit/packagekit-0.6.2.ebuild b/app-admin/packagekit/packagekit-0.6.6.ebuild index 6350ec3068..ab7df7116a 100644 --- a/app-admin/packagekit/packagekit-0.6.2.ebuild +++ b/app-admin/packagekit/packagekit-0.6.6.ebuild @@ -4,7 +4,9 @@ EAPI="2" -inherit eutils multilib python autotools nsplugins +RESTRICT="test" # tests are failing atm + +inherit autotools-utils multilib python nsplugins MY_PN="PackageKit" MY_P=${MY_PN}-${PV} @@ -14,16 +16,17 @@ HOMEPAGE="http://www.packagekit.org/" SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz" LICENSE="GPL-2" -SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="connman +consolekit cron gtk networkmanager nsplugin pm-utils +SLOT="0" +IUSE="connman cron gtk networkmanager nls nsplugin pm-utils +policykit qt4 static-libs test udev" CDEPEND=" dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.16.1:2 - >=sys-apps/dbus-1.3.0 + dev-libs/gobject-introspection + >=sys-apps/dbus-1.2.24 connman? ( net-misc/connman ) gtk? ( dev-libs/dbus-glib @@ -40,7 +43,7 @@ CDEPEND=" >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) - policykit? ( >=sys-auth/polkit-0.94 ) + policykit? ( >=sys-auth/polkit-0.96 ) qt4? ( >=x11-libs/qt-core-4.4.0 >=x11-libs/qt-dbus-4.4.0 @@ -63,29 +66,17 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} >=app-portage/layman-1.2.3 - >=sys-apps/portage-2.2_rc39 - consolekit? ( sys-auth/consolekit ) + >=sys-apps/portage-2.2_rc67 pm-utils? ( sys-power/pm-utils ) " -APP_LINGUAS="as bg bn ca cs da de el en_GB es fi fr gu he hi hu it ja kn ko ml mr -ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te th tr uk zh_CN zh_TW" -for X in ${APP_LINGUAS}; do - IUSE=" ${IUSE} linguas_${X}" -done - S="${WORKDIR}/${MY_P}" -RESTRICT="test" # tests are failing atm # NOTES: -# polkit is in gnome overlay, otherwise, should use policykit # do not use a specific user, useless and not more secure according to upstream # doc is in the tarball and always installed -# ruck is broken (RDEPEND dev-python/urlgrabber), upstream bug 23248 # mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2 # (R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247 -# using >=dbus-1.3.0 instead of >=dbus-1.1.1 because of a bug fixed in 1.3.0 -# glib2 is experimental atm. Think about a USE flag when it will be usable. # TODO: # +doc to install doc/website @@ -95,81 +86,69 @@ RESTRICT="test" # tests are failing atm # documentation/website with --enable-doc-install # failing tests +DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO) + src_prepare() { + autotools-utils_src_prepare + eautoreconf } src_configure() { - local myconf="" + # localstatedir: for gentoo it's /var/lib but for $PN it's /var + # option-check,libtool-lock,strict,local: obvious reasons + # gtk-doc: doc already built + # command,debuginfo,gstreamer,service-packs: not supported by backend + myeconfargs=( + --localstatedir=/var + --enable-option-checking + --enable-libtool-lock + --disable-strict + --disable-local + --disable-gtk-doc + --disable-command-not-found + --disable-debuginfo-install + --disable-gstreamer-plugin + --disable-service-packs + --disable-managed + --enable-man-pages + --disable-dummy + --enable-portage + --with-default-backend=portage + $(use_enable connman) + $(use_enable cron) + $(use_enable gtk gtk-module) + $(use_enable networkmanager) + $(use_enable nls) + $(use_enable nsplugin browser-plugin) + $(use_enable pm-utils) + $(use_enable qt4 qt) + $(use_enable test tests) + $(use_enable udev device-rebind) + ) if use policykit; then - myconf+=" --with-security-framework=polkit" + myconfargs+=(--with-security-framework=polkit) else - myconf+=" --with-security-framework=dummy" + myconfargs+=(--with-security-framework=dummy) fi - if [[ -z "${LINGUAS}" ]]; then - myconf+=" --disable-nls" - else - myconf+=" --enable-nls" - fi - - # localstatedir: for gentoo it's /var/lib but for $PN it's /var - # dep-tracking,option-check,libtool-lock,strict,local: obvious reasons - # gtk-doc: doc already built - # command,debuginfo,gstreamer,service-packs: not supported by backend - # ruck,managed: failing (see UPSTREAM in ebuild header) - # glib2: experimental - econf \ - ${myconf} \ - --localstatedir=/var \ - --disable-dependency-tracking \ - --enable-option-checking \ - --enable-libtool-lock \ - --disable-strict \ - --disable-local \ - --disable-gtk-doc \ - --disable-command-not-found \ - --disable-debuginfo-install \ - --disable-gstreamer-plugin \ - --disable-service-packs \ - --disable-ruck \ - --disable-managed \ - --enable-man-pages \ - --disable-dummy \ - --enable-portage \ - --with-default-backend=portage \ - $(use_enable connman) \ - $(use_enable cron) \ - $(use_enable gtk gtk-module) \ - $(use_enable networkmanager) \ - $(use_enable nsplugin browser-plugin) \ - $(use_enable pm-utils) \ - $(use_enable qt4 qt) \ - $(use_enable static-libs static) \ - $(use_enable test tests) \ - $(use_enable udev device-rebind) + autotools-utils_src_configure } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TODO || die "dodoc failed" + autotools-utils_src_install if use nsplugin; then src_mv_plugins /usr/$(get_libdir)/mozilla/plugins fi - if ! use static-libs; then - find "${D}" -name *.la | xargs rm || die "removing .la files failed" - fi - # Remove precompiled python modules, we handle byte compiling rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co] } pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/${PN} + python_mod_optimize "$(python_get_sitedir)/${PN}" if ! use policykit; then ewarn "You are not using policykit, the daemon can't be considered as secure." @@ -180,13 +159,6 @@ pkg_postinst() { ebeep epause 5 fi - - if ! use consolekit; then - ewarn "You have disabled consolekit support." - ewarn "Even if you can run ${MY_PN} without a running ConsoleKit daemon," - ewarn "it is not recommanded nor supported upstream." - echo - fi } pkg_prerm() { diff --git a/app-admin/packagekit/packagekit-9999.ebuild b/app-admin/packagekit/packagekit-9999.ebuild deleted file mode 100644 index 25f27c1820..0000000000 --- a/app-admin/packagekit/packagekit-9999.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/packagekit" - GIT_ECLASS="git" -fi -inherit eutils multilib python autotools nsplugins bash-completion ${GIT_ECLASS} - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API" -HOMEPAGE="http://www.packagekit.org/" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -else - SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz" -fi - -LICENSE="GPL-2" -SLOT="0" -# KEYWORDS="~amd64 ~x86" -KEYWORDS="" -IUSE="connman +consolekit cron doc gtk networkmanager nsplugin pm-utils -+policykit +portage entropy qt4 static-libs test udev" - -CDEPEND=" - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.16.1:2 - >=sys-apps/dbus-1.3.0 - doc? ( dev-util/gtk-doc ) - connman? ( net-misc/connman ) - gtk? ( - dev-libs/dbus-glib - media-libs/fontconfig - >=x11-libs/gtk+-2.14.0:2 - x11-libs/pango - ) - networkmanager? ( >=net-misc/networkmanager-0.6.4 ) - nsplugin? ( - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/nspr - x11-libs/cairo - >=x11-libs/gtk+-2.14.0:2 - x11-libs/pango - ) - policykit? ( >=sys-auth/polkit-0.94 ) - qt4? ( - >=x11-libs/qt-core-4.4.0 - >=x11-libs/qt-dbus-4.4.0 - >=x11-libs/qt-sql-4.4.0 - ) - udev? ( >=sys-fs/udev-145[extras] ) -" -DEPEND="${CDEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.35.0 - dev-util/pkgconfig - sys-devel/gettext - nsplugin? ( >=net-libs/xulrunner-1.9.1 ) - test? ( - qt4? ( - dev-util/cppunit - >=x11-libs/qt-gui-4.4.0 - ) - ) -" -if [[ ${PV} = *9999* ]]; then - # GIT HEAD actually requires gtk-doc - DEPEND="${DEPEND} dev-util/gtk-doc" -fi - -RDEPEND="${CDEPEND} - >=app-portage/layman-1.2.3 - >=sys-apps/portage-2.2_rc39 - consolekit? ( sys-auth/consolekit ) - pm-utils? ( sys-power/pm-utils ) -" - -APP_LINGUAS="as bg bn ca cs da de el en_GB es fi fr gu he hi hu it ja kn ko ml mr -ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te th tr uk zh_CN zh_TW" -for X in ${APP_LINGUAS}; do - IUSE=" ${IUSE} linguas_${X}" -done - -S="${WORKDIR}/${MY_P}" -RESTRICT="test" # tests are failing atm - -# NOTES: -# polkit is in gnome overlay, otherwise, should use policykit -# do not use a specific user, useless and not more secure according to upstream -# doc is in the tarball and always installed -# ruck is broken (RDEPEND dev-python/urlgrabber), upstream bug 23248 -# mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2 -# (R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247 -# using >=dbus-1.3.0 instead of >=dbus-1.1.1 because of a bug fixed in 1.3.0 -# glib2 is experimental atm. Think about a USE flag when it will be usable. - -# TODO: -# +doc to install doc/website -# check if test? qt? ( really needs qt-gui) - -# UPSTREAM: -# documentation/website with --enable-doc-install -# failing tests - -src_prepare() { - if [[ ${PV} = *9999* ]]; then - # sheeesh! this gtk things is going to kill me - gtkdocize - intltoolize - fi - eautoreconf -} - -src_configure() { - local myconf="" - - if use policykit; then - myconf+=" --with-security-framework=polkit" - else - myconf+=" --with-security-framework=dummy" - fi - - if [[ -z "${LINGUAS}" ]]; then - myconf+=" --disable-nls" - else - myconf+=" --enable-nls" - fi - - # localstatedir: for gentoo it's /var/lib but for $PN it's /var - # dep-tracking,option-check,libtool-lock,strict,local: obvious reasons - # command,debuginfo,gstreamer,service-packs: not supported by backend - # ruck,managed: failing (see UPSTREAM in ebuild header) - # glib2: experimental - # default backend is autodetected - # --with-default-backend=portage - econf \ - ${myconf} \ - --localstatedir=/var \ - --disable-dependency-tracking \ - --enable-option-checking \ - --enable-libtool-lock \ - --disable-strict \ - --disable-local \ - $(use_enable doc gtk-doc) \ - $(use_enable bash-completion command-not-found) \ - --disable-debuginfo-install \ - --disable-gstreamer-plugin \ - --disable-service-packs \ - --disable-ruck \ - --disable-managed \ - --enable-man-pages \ - $(use_enable portage) \ - $(use_enable entropy) \ - $(use_enable cron) \ - $(use_enable gtk gtk-module) \ - $(use_enable networkmanager) \ - $(use_enable nsplugin browser-plugin) \ - $(use_enable pm-utils) \ - $(use_enable qt4 qt) \ - $(use_enable static-libs static) \ - $(use_enable test tests) \ - $(use_enable udev device-rebind) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS MAINTAINERS NEWS README TODO || die "dodoc failed" - if [[ ${PV} != *9999* ]]; then - dodoc ChangeLog || die "dodoc failed" - fi - - if use nsplugin; then - src_mv_plugins /usr/$(get_libdir)/mozilla/plugins - fi - - if ! use static-libs; then - find "${D}" -name *.la | xargs rm || die "removing .la files failed" - fi - - # Remove precompiled python modules, we handle byte compiling - rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co] - - dobashcompletion "${S}/contrib/pk-completion.bash" ${PN} - # Remove bashcomp file installed by build-system - rm -f "${D}/bash_completion.d/pk-completion.bash" - - # Remove unwanted PackageKit website stuff - rm -rf "${D}/usr/share/PackageKit/website" -} - -pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/${PN} - - if ! use policykit; then - ewarn "You are not using policykit, the daemon can't be considered as secure." - ewarn "All users will be able to do anything through ${MY_PN}." - ewarn "Please, consider rebuilding ${MY_PN} with policykit USE flag." - ewarn "THIS IS A SECURITY ISSUE." - echo - ebeep - epause 5 - fi - - if ! use consolekit; then - ewarn "You have disabled consolekit support." - ewarn "Even if you can run ${MY_PN} without a running ConsoleKit daemon," - ewarn "it is not recommanded nor supported upstream." - echo - fi - - bash-completion_pkg_postinst -} - -pkg_prerm() { - einfo "Removing downloaded files with ${MY_PN}..." - [[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \ - rm -rf /var/cache/PackageKit/downloads/* -} - -pkg_postrm() { - python_mod_cleanup $(python_get_sitedir)/${PN} -} |