+++ /dev/null
---- wbarconf/install.sh
-+++ wbarconf/install.sh
-@@ -1,5 +1,6 @@
- #!/bin/sh
- startdir=$1
-+version=0.7.2.2
-
- if [ $(echo $1|wc -w) -eq 0 ];then
- echo "Usage: install.sh /path/to"
-@@ -8,29 +9,28 @@
- exit 1
- fi
-
--echo "Installing in to $startdir..."
-+echo "Installing in to ${startdir}..."
-
-+cd "$(dirname "$(readlink -f "$0")")" || exit 1
-
--mkdir -p $startdir/bin/ || return 1
--install -m0755 wbarconf $startdir/bin/ || return 1
-+mkdir -p "${startdir}"/bin/ || exit 1
-+install -m0755 wbarconf "${startdir}"/bin/ || exit 1
-
--mkdir -p $startdir/share/wbarconf/
--install -m0644 README $startdir/share/wbarconf/ || return 1
--install -m0644 COPYING $startdir/share/wbarconf/ || return 1
-+mkdir -p "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
-+install -m0644 README "${startdir}"/share/doc/wbarconf-${version}/ || exit 1
-+install -m0644 wbarbacks/README "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
-
--mkdir -p $startdir/share/locale/ || return 1
--cp -av locale/* $startdir/share/locale/ || return 1
--chmod 0755 -R $startdir/share/ || return 1
--find $startdir/share/locale/ -name wbarconf.po -print | xargs rm -f
--install -m0644 messages.pot $startdir/share/wbarconf/ || return 1
-+find . -type d -name LC_MESSAGES -exec mkdir -p "${startdir}/share/{}" \; || exit 1
-+find . -type f -name wbarconf.mo -exec install -m0644 '{}' "${startdir}/share/{}" \; || exit 1
-
--cp -av wbarbacks $startdir/share/wbarconf/ || return 1
--chmod 0655 -R $startdir/share/wbarconf/ || return 1
-+mkdir -p "${startdir}"/share/wbarconf/wbarbacks/ || exit 1
-+install -m0644 messages.pot "${startdir}"/share/wbarconf/ || exit 1
-+find ./wbarbacks -type f -name "*.png" -exec install -m0644 '{}' "${startdir}/share/wbarconf/{}" \; || exit 1
-
--mkdir -p $startdir/share/pixmaps/
--install -m0644 wbarconf.png $startdir/share/pixmaps/ || return 1
-+mkdir -p "${startdir}"/share/pixmaps/ || exit 1
-+install -m0644 wbarconf.png "${startdir}"/share/pixmaps/ || exit 1
-
--mkdir -p $startdir/share/applications/
--install -m0644 wbarconf.desktop $startdir/share/applications/ || return 1
-+mkdir -p "${startdir}"/share/applications/ || exit 1
-+install -m0644 wbarconf.desktop "${startdir}"/share/applications/ || exit 1
-
- echo "Installation complete."
---- wbarconf/wbarconf.desktop
-+++ wbarconf/wbarconf.desktop
-@@ -2,10 +2,10 @@
- Name=WbarConf
- Exec=wbarconf
- Type=Application
--Icon=wbarconf.png
-+Icon=wbarconf
- Terminal=false
- StartupNotify=true
--Categories=GTK;Utility;
-+Categories=GTK;Utility;
- Comment=Configuration tool for wbar
- Comment[de]=Konfigurationswerkzeug für Wbar
- Comment[fi]=Asetustyökalu wbar:lle
---- wbarconf/wbarconf
-+++ wbarconf/wbarconf
-@@ -51,7 +51,7 @@
- print("Gettext error, defaulting to english!")
- # return message
-
--wbarversion="0.7.2.1"
-+wbarversion="0.7.2.2"
-
- ITEM_ID = 0
- ITEM_ICON = 1
+++ /dev/null
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Configuration GUI for x11-misc/wbar"
-HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
-SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="
- ${PYTHON_DEPS}
- >=x11-misc/wbar-1.3.3
- $(python_gen_cond_dep '
- dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
- dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
- ')"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/${P}-install.patch )
-
-src_compile() {
- python_fix_shebang wbarconf
-}
-
-src_install() {
- ./install.sh "${ED%/}/usr" || die "./install.sh failed."
-}
+++ /dev/null
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Configuration GUI for x11-misc/wbar"
-HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
-SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- sys-devel/gettext
-"
-RDEPEND="
- ${PYTHON_DEPS}
- >=x11-misc/wbar-1.3.3
- $(python_gen_cond_dep '
- dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
- dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
- ')
-"
-PATCHES=(
- "${FILESDIR}"/${P}-install.patch
-)
-S="${WORKDIR}/${PN}"
-
-src_compile() {
- python_fix_shebang wbarconf
-}
-
-src_install() {
- ./install.sh "${ED}/usr" || die "./install.sh failed"
- if [[ "${P}" != "${PF}" ]]; then
- mv "${ED}"/usr/share/doc/{${P},${PF}} || die
- fi
-}