don't use this eclass for plank
authordweezil <bram.aelvoet@gmail.com>
Mon, 26 Nov 2018 20:09:01 +0000 (21:09 +0100)
committerdweezil <bram.aelvoet@gmail.com>
Mon, 26 Nov 2018 20:09:01 +0000 (21:09 +0100)
eclass/ubuntu-versionator.eclass [deleted file]
x11-misc/plank/Manifest
x11-misc/plank/metadata.xml [new file with mode: 0644]
x11-misc/plank/plank-0.11.4.ebuild

diff --git a/eclass/ubuntu-versionator.eclass b/eclass/ubuntu-versionator.eclass
deleted file mode 100644 (file)
index b1c96ba..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-# @ECLASS: ubuntu-versionator.eclass
-# @MAINTAINER:
-# Rick Harris <rickfharris@yahoo.com.au>
-# @BLURB: Eclass to turn the example of package-version_p0_p0302 into 0ubuntu3.2
-# @DESCRIPTION:
-# This eclass simplifies manipulating $PVR for the purpose of creating
-#  <patchlevel>ubuntu<revision> strings for Ubuntu based SRC_URIs
-
-## Naming convention examples ##
-# 0ubuntu0.12.10.3             = package-3.6.0_p_p0_p00121003
-# 0ubuntu0.13.04.3             = package-3.6.0_p_p0_p00130403
-# 0ubuntu3.2                   = package-3.6.0_p_p0_p0302
-# 1ubuntu5                     = package-3.6.0_p_p1_p05
-# 0ubuntu6                     = package-3.6.0_p_p0_p06
-# +14.10.20140915-1ubuntu2.2   = package-3.6.0_p20140915_p1_p0202 (14.10 is the Ubuntu release version taken from URELEASE)
-#
-## When upgrading <revision> from a floating point to a whole number, portage will see the upgrade as a downgrade ##
-# Example: package-3.6.0_p_p0_p0101 (0ubuntu1.1) to package-3.6.0_p_p0_p02 (0ubuntu2)
-# If this occurs, the ebuild should be named package-3.6.0a_p0_p02
-
-
-inherit toolchain-funcs
-EXPORT_FUNCTIONS pkg_setup pkg_postinst
-
-#---------------------------------------------------------------------------------------------------------------------------------#
-### GLOBAL ECLASS INHERIT DEFAULTS ##
-
-## vala.eclass ##
-# Set base sane vala version for all packages requiring vala, override in ebuild if or when specific higher/lower versions are needed #
-export VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:=0.36}      # Needs to be >=${minimal_supported_minor_version} from vala.eclass
-export VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:=0.36}
-export VALA_USE_DEPEND="vapigen"
-
-## Ubuntu delete superceded release tarballs from their mirrors if the release is not Long Term Supported (LTS) ##
-# Download tarballs from the always available Launchpad archive #
-UURL="https://launchpad.net/ubuntu/+archive/primary/+files"
-
-#---------------------------------------------------------------------------------------------------------------------------------#
-
-[[ "${URELEASE}" == *trusty* ]] && UVER_RELEASE="14.04"
-[[ "${URELEASE}" == *utopic* ]] && UVER_RELEASE="14.10"
-[[ "${URELEASE}" == *vivid* ]] && UVER_RELEASE="15.04"
-[[ "${URELEASE}" == *wily* ]] && UVER_RELEASE="15.10"
-[[ "${URELEASE}" == *xenial* ]] && UVER_RELEASE="16.04"
-[[ "${URELEASE}" == *yakkety* ]] && UVER_RELEASE="16.10"
-[[ "${URELEASE}" == *zesty* ]] && UVER_RELEASE="17.04"
-[[ "${URELEASE}" == *artful* ]] && UVER_RELEASE="17.10"
-[[ "${URELEASE}" == *bionic* ]] && UVER_RELEASE="18.04"
-[[ "${URELEASE}" == *cosmic* ]] && UVER_RELEASE="18.10"
-
-PV="${PV%%[a-z]_p*}"   # For package-3.6.0a_p0_p02
-PV="${PV%%[a-z]*}"     # For package-3.6.0a
-PV="${PV%%_p*}"                # For package-3.6.0_p0_p02
-PV="${PV%%_*}"         # For package-3.6.0_p_p02
-
-MY_P="${PN}_${PV}"
-S="${WORKDIR}/${PN}-${PV}"
-
-OIFS="${IFS}"
-IFS=p; read -ra PVR_ARRAY <<< "${PVR}"
-IFS="${OIFS}"
-
-## Micro version field ##
-PVR_PL_MICRO="${PVR_ARRAY[1]}"
-PVR_PL_MICRO="${PVR_PL_MICRO%*_}"
-PVR_PL_MICRO="${PVR_PL_MICRO%%-r*}"     # Strip revision strings
-       [[ -n "${strarray[@]}" ]] && unset 'strarray[@]'
-               char=2
-               index=1
-               strlength="${#PVR_PL_MICRO}"
-       while [ "${PVR_PL_MICRO}" != "" ]; do
-               strtmp="${PVR_PL_MICRO:0:$char}"
-               if [ "${strlength}" -ge 10 ]; then      # Last field can be a floating point so strip off leading zero and add decimal point #
-                       if [ "${index}" = 5 ]; then
-                               strtmp=".${strtmp#0}"
-                       fi
-               fi
-               strarray+=( "${strtmp}" )
-               PVR_PL_MICRO="${PVR_PL_MICRO:$char}"
-               ((index++))
-       done
-PVR_PL_MICRO_tmp="${strarray[@]}"
-PVR_MICRO="${PVR_PL_MICRO_tmp// /}"
-
-## Major version field ##
-PVR_PL_MAJOR="${PVR_ARRAY[2]}"
-PVR_PL_MAJOR="${PVR_PL_MAJOR%*_}"
-# Support floating point version numbers in major version field (eg. libnih-1.0.3_p0403_p01.ebuild becomes libnih-1.0.3-4.3ubuntu1)
-if [ "${#PVR_PL_MAJOR}" -gt 1 ]; then
-       PVR_PL_MAJOR="${PVR_PL_MAJOR%%-r*}"     # Strip revision strings
-               char=2
-               index=1
-               strlength="${#PVR_PL_MAJOR}"
-               while [ "${PVR_PL_MAJOR}" != "" ]; do   # Iterate through all chars loading every 2 chars into an array element
-                       strtmp="${PVR_PL_MAJOR:0:$char}"
-                       strtmp="${strtmp#0}"
-                       strarray+=( "${strtmp}" )
-                       PVR_PL_MAJOR="${PVR_PL_MAJOR:$char}"
-                       ((index++))
-               done
-       PVR_PL_MAJOR_tmp="${strarray[@]}"
-       PVR_PL_MAJOR="${PVR_PL_MAJOR_tmp// /.}"
-fi
-
-## Minor version field ##
-PVR_PL_MINOR="${PVR_ARRAY[3]}"
-PVR_PL_MINOR="${PVR_PL_MINOR%*_}"
-PVR_PL_MINOR="${PVR_PL_MINOR%%-r*}"    # Strip revision strings
-       [[ -n "${strarray[@]}" ]] && unset 'strarray[@]'
-       char=2
-       index=1
-       strlength="${#PVR_PL_MINOR}"
-       while [ "${PVR_PL_MINOR}" != "" ]; do   # Iterate through all chars loading every 2 chars into an array element
-               strtmp="${PVR_PL_MINOR:0:$char}"
-               if [ "${strlength}" -ge 6 ]; then       # Don't strip zeros from 3rd number field, this is the Ubuntu OS release #
-                       if [ "${index}" != 3 ]; then
-                               strtmp="${strtmp#0}"
-                       fi
-               else
-                       strtmp="${strtmp#0}"
-               fi
-               strarray+=( "${strtmp}" )
-               PVR_PL_MINOR="${PVR_PL_MINOR:$char}"
-               ((index++))
-       done
-PVR_PL_MINOR_tmp="${strarray[@]}"
-PVR_PL_MINOR="${PVR_PL_MINOR_tmp// /.}"
-
-if [ "${PN}" = "ubuntu-sources" ]; then
-       UVER="${PVR_PL_MAJOR}.${PVR_PL_MINOR}"
-else
-       UVER="${PVR_PL_MAJOR}ubuntu${PVR_PL_MINOR}"
-fi
-
-# @FUNCTION: ubuntu-versionator_pkg_setup
-# @DESCRIPTION:
-# Check we have a valid profile set and the correct
-# masking in place for the overlay to work
-ubuntu-versionator_pkg_setup() {
-       debug-print-function ${FUNCNAME} "$@"
-
-        # Use a profile to set things like make.defaults and use.mask only, and to fill $SUBSLOT for unity-base/unity-build-env:0/${SUBSLOT}
-        # unity-base/unity-build-env creates symlinks in /etc/portage/package.{keywords,mask,use}/unity-portage.{keywords,mask,use}
-       #       pointing to overlay's profiles/<release>/unity-portage.{keywords,mask,use}
-        #   This allows masking category/package::gentoo and overriding IUSE in /etc/portage/make.conf, which cannot be done in profiles/
-        #   Using profiles/ also sets a sane base set of USE flags by all profiles inheriting the Gentoo 'desktop' profile
-
-        if [ -z "${UNITY_BUILD_OK}" ]; then     # Creates a oneshot so it only checks on the 1st package in the emerge list
-               CURRENT_PROFILE=$(readlink /etc/portage/make.profile)
-
-                if [ -z "$(echo ${CURRENT_PROFILE} | grep unity-gentoo)" ]; then
-                        die "Invalid profile detected, please select a 'unity-gentoo' profile for your architecture shown in 'eselect profile list'"
-                else
-                       PROFILE_RELEASE=$(echo "${CURRENT_PROFILE}" | awk -F/ '{print $(NF-0)}')
-                fi
-
-                has_version unity-base/unity-build-env:0/${PROFILE_RELEASE} || \
-                       die "'${PROFILE_RELEASE}' profile detected, please run 'emerge unity-base/unity-build-env:0/${PROFILE_RELEASE}' to setup package masking"
-                export UNITY_BUILD_OK=1
-        fi
-
-       # Minimum system-wide GCC version required #
-       [[ "${PROFILE_RELEASE}" == utopic ]] && GCC_MINIMUM="4.8.5"
-       [[ "${PROFILE_RELEASE}" == vivid ]] && GCC_MINIMUM="4.9.4"
-       [[ "${PROFILE_RELEASE}" == wily ]] && GCC_MINIMUM="5.4.0"
-       [[ "${PROFILE_RELEASE}" == xenial ]] && GCC_MINIMUM="5.4.0"
-       [[ "${PROFILE_RELEASE}" == yakkety ]] && GCC_MINIMUM="5.4.0"
-       [[ "${PROFILE_RELEASE}" == zesty ]] && GCC_MINIMUM="6.3.0"
-       [[ "${PROFILE_RELEASE}" == artful ]] && GCC_MINIMUM="6.4.0"
-       GCC_CURRENT=$(gcc-fullversion)
-
-       [[ ${GCC_CURRENT//./} -lt ${GCC_MINIMUM//./} ]] \
-               && die "The selected '${PROFILE_RELEASE}' profile requires your system be built using >=sys-devel/gcc:${GCC_MINIMUM}, please consult the output of 'gcc-config -l'"
-
-       # Disable ld.gold linker if selected as it causes undefined reference linking failures (see net-libs/ubuntu-download-manager linking with sys-libs/libnih) #
-       #       This type of build failure is intended by upstream (see https://sourceware.org/bugzilla/show_bug.cgi?id=10238)
-       [[ "$(ld -v | grep gold)" ]] && \
-               die "The selected 'ld' library linker must be set to 'ld.bfd' due to link failures using other experimental linkers, as root do 'binutils-config --linker ld.bfd'"
-}
-
-# @FUNCTION: ubuntu-versionator_src_prepare
-# @DESCRIPTION:
-# Apply common src_prepare tasks such as patching
-ubuntu-versionator_src_prepare() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       # Apply Ubuntu patchset if one is present #
-       [[ -f "${WORKDIR}/debian/patches/series" ]] && UPATCH_DIR="${WORKDIR}/debian/patches"
-       [[ -f "debian/patches/series" ]] && UPATCH_DIR="debian/patches"
-       if [ -d "${UPATCH_DIR}" ]; then
-               for patch in $(grep -v \# "${UPATCH_DIR}/series"); do
-                       UBUNTU_PATCHES+=( "${UPATCH_DIR}/${patch}" )
-               done
-               [[ ${UBUNTU_PATCHES[@]} ]] && einfo "  <-- Ubuntu patchset -->"
-       fi
-       # Many eclasses (cmake-utils,distutils-r1,qt5-build,xdg) apply their own 'default' command for EAPI=6 or 'epatch ${PATCHES[@]}' command for EAPI <6 so let them #
-       #       'declare' checks to see if any of those functions are set/inherited and only apply 'default' if they are not
-       if [ "${EAPI}" -ge 6 ]; then
-               [[ ${UBUNTU_PATCHES[@]} ]] && eapply "${UBUNTU_PATCHES[@]}"
-               [[ $(declare -Ff cmake-utils_src_prepare) ]] || \
-               [[ $(declare -Ff distutils-r1_src_prepare) ]] || \
-               [[ $(declare -Ff qt5-build_src_prepare) ]] || \
-               [[ $(declare -Ff xdg_src_prepare) ]] || \
-                       default
-       else
-               [[ ${UBUNTU_PATCHES[@]} ]] && epatch "${UBUNTU_PATCHES[@]}"
-               # Only apply base_src_prepare if EAPI<6 and have inherited base.eclass #
-               #       (use 'base' eclass while 'autotools-{multilib,utils}','gnome2','kde-4','qt4-r2','readme.gentoo','xorg-2(autotools-utils)' block EAPI6 upgrade) #
-               [[ $(declare -Ff base_src_prepare) ]] && \
-                       base_src_prepare
-       fi
-}
-
-# @FUNCTION: ubuntu-versionator_pkg_postinst
-# @DESCRIPTION:
-# Re-create bamf.index and trigger re-profile of ureadahead if installed
-ubuntu-versionator_pkg_postinst() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       ## Create a new bamf-2.index file at postinst stage of every package to capture all *.desktop files ##
-       if [[ -x /usr/bin/bamf-index-create ]]; then
-               einfo "Checking bamf-2.index"
-                       /usr/bin/bamf-index-create triggered
-       fi
-
-       ## If sys-apps/ureadahead is installed, force re-profiling of ureadahead's database at next boot ##
-       if [[ -n "$(systemctl list-unit-files --no-pager | grep ureadahead)" ]] && \
-               [[ "$(systemctl is-enabled ureadahead-collect.service)" = "enabled" ]]; then
-                       if [[ -w /var/lib/ureadahead/pack ]] && \
-                               [[ -d "${ED}etc" ]]; then
-                                       elog "Ureadahead will be reprofiled on next reboot"
-                                               rm -f /var/lib/ureadahead/pack /var/lib/ureadahead/*.pack 2> /dev/null
-                       fi
-       fi
-}
index bc7ab0ef200a370e44a214a28d750dca446bb2b0..3d583c7ec9c9f3de6502dd5aca52b7e68098f0ea 100644 (file)
@@ -1,2 +1,3 @@
-DIST plank_0.11.4.orig.tar.xz 1022640 BLAKE2B 9a33759e32fb9af9884b530776ebcb59a67efbf6908ba7a493c6863a3c3f26a919e972600a73c4225ab0ec80b44586ad33fa57446ca1b5d96c7d295a25b73e9a SHA512 178d78ecb6a6cc66237b4024a10db135626cd1623717c8e218f0ba3b630af1868bc8c174b5c87ab7762c3b62837d2554cadd44b2731edc03f965441d48ccaa77
-EBUILD plank-0.11.4.ebuild 961 BLAKE2B ac9d9652ea99a99d5d7ecedff4397b17e1923d725ae5785c2ad79c42d7a5923b080a0af51f85b93bb0b3c7d9f8cd5518822b7afd720aa9fd614c8f1c95833ace SHA512 30205b8729245356fed6d080042edf6c0eefdcecae17dd728e4575dd4296ff8be85ef8e259a10957fe460ec961284e948b93b0941078aac534235605f493461e
+DIST plank-0.11.4.tar.xz 1022640 BLAKE2B 9a33759e32fb9af9884b530776ebcb59a67efbf6908ba7a493c6863a3c3f26a919e972600a73c4225ab0ec80b44586ad33fa57446ca1b5d96c7d295a25b73e9a SHA512 178d78ecb6a6cc66237b4024a10db135626cd1623717c8e218f0ba3b630af1868bc8c174b5c87ab7762c3b62837d2554cadd44b2731edc03f965441d48ccaa77
+EBUILD plank-0.11.4.ebuild 962 BLAKE2B ce5b116171959a554b648a582db3613bed4b13d85d632088a81d3693affeea8ab67486bd6153474b6f04b847d95a82776073ca17d3dadf315aa7fd000a6b96fd SHA512 cd5b583cea939de2df86dc360b5491e0c0d17dc79a8f11ea7d64db6224dd0917de5f95ec1acf3000a82005e7fcfebce3ced6c62c18a7ce8dfdebcdf5d0d45317
+MISC metadata.xml 448 BLAKE2B e611ca677d857391ce408472bd9673de87bb3e1a831463e7da2fb7ec5aafa42994300f1d1f1fbf41888f416cc9c89d7ef1c224d2e50d6bbaddd0b0989f622bd3 SHA512 3a848c827e9382590c9442f9420a068d7587da705a795af6eb02d91f0fc1230fcbb0b285e6ad6d3759f567ed5e8d206f9cedd64ab47389eaea29fcdc530719e6
diff --git a/x11-misc/plank/metadata.xml b/x11-misc/plank/metadata.xml
new file mode 100644 (file)
index 0000000..d0d6b5e
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <maintainer type="person">
+               <email>jpizarrocallejas@gmail.com</email>
+               <name>Jorge Pizarro Callejas</name>
+               <description>Jorgicio Gentoo Overlay</description>
+       </maintainer>
+       <use>
+               <flag name="appindicator">Enable support for appindicator</flag>
+               <flag name="gtk3">Enable GTK+ 3 support</flag>
+       </use>
+</pkgmetadata>
index 0289aa006077f956fc72a2083bc40f446f9e9b54..1a3a29b666950912fee425f19a6c5a1d565c3cb9 100644 (file)
@@ -3,43 +3,54 @@
 
 EAPI=6
 
 
 EAPI=6
 
-URELEASE="cosmic"
-inherit vala autotools ubuntu-versionator
+VALA_MIN_API_VERSION=0.26
+VALA_USE_DEPEND=vapigen
 
 
-UVER="-${PVR_MICRO}"
+inherit autotools gnome2-utils vala
 
 
-DESCRIPTION="Dock panel famious docky"
+DESCRIPTION="Dock panel famous docky"
 HOMEPAGE="https://launchpad.net/plank"
 HOMEPAGE="https://launchpad.net/plank"
-SRC_URI="${UURL}/${MY_P}.orig.tar.xz"
+SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.xz"
 
 LICENSE="LGPL-3"
 SLOT="0"
 
 LICENSE="LGPL-3"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+introspection doc static-libs"
 IUSE="+introspection doc static-libs"
-RESTRICT="mirror"
-RDEPEND="dev-libs/glib:2
-       dev-libs/libdbusmenu
-       dev-libs/libgee:0.8
-       x11-libs/bamf
-       x11-libs/gtk+:3
-       x11-libs/libwnck:3
-       x11-libs/libX11"
-DEPEND="${RDEPEND}
+
+DEPEND="
+       $(vala_depend)
        dev-util/intltool
        gnome-base/gnome-common
        sys-devel/gettext
        virtual/pkgconfig
        dev-util/intltool
        gnome-base/gnome-common
        sys-devel/gettext
        virtual/pkgconfig
-       $(vala_depend)"
+"
+RDEPEND="${DEPEND}
+       >=dev-libs/glib-2.32:2
+       dev-libs/libgee:0.8
+       x11-libs/gtk+:3
+       x11-libs/bamf
+       x11-libs/libX11
+       dev-libs/libdbusmenu
+       x11-libs/libwnck:3
+"
+DOCS=( AUTHORS COPYRIGHT )
 
 
-src_prepare() {
-       ubuntu-versionator_src_prepare
+src_prepare(){
        eautoreconf
        eautoreconf
-#      NOCONFIGURE=1 REQUIRED_PKG_CONFIG_VERSION=0.1 ./autogen.sh
        vala_src_prepare
        vala_src_prepare
+       default
+}
+
+pkg_preinst(){
+       gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+       gnome2_gconf_install
+       gnome2_schemas_update
 }
 
 }
 
-src_install() {
-       emake DESTDIR="${ED}" install
-       # Delete some files that are only useful on Ubuntu
-       rm -rf "${ED}"{etc,usr/share}/apport
+pkg_postrm(){
+       gnome2_gconf_uninstall
+       gnome2_schemas_update
 }
 }