commit: 5608a05189223ac78c7b9c92f2a631318ebd5d5a Author: Michael Weber <xmw <AT> gentoo <DOT> org> AuthorDate: Fri Jan 8 11:11:17 2016 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Fri Jan 8 11:13:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5608a051
app-backup/backintime: Drop old. Package-Manager: portage-2.2.26 app-backup/backintime/Manifest | 1 - app-backup/backintime/backintime-1.1.4.ebuild | 78 ---------------------- app-backup/backintime/backintime-1.1.8.ebuild | 78 ---------------------- .../backintime-1.0.24-dont-install-license.patch | 49 -------------- .../files/backintime-1.0.24-wrapper.patch | 64 ------------------ .../files/backintime-1.0.36-wrapper.patch | 65 ------------------ .../backintime-1.0.4-fix-configure-warning.diff | 17 ----- .../files/backintime-1.0.4-kde4-root.desktop | 11 --- .../backintime-1.1.4-python-version-stderr.patch | 11 --- 9 files changed, 374 deletions(-) diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest index 51ec214..e377aca 100644 --- a/app-backup/backintime/Manifest +++ b/app-backup/backintime/Manifest @@ -1,2 +1 @@ -DIST backintime-1.1.4.tar.gz 562964 SHA256 434fc1fb6d9ac20d7b04c791e39bf9e077773c696e18f2bf1aa8f3e7fb59a770 SHA512 a207833c9708166cfbc4e0aa36c6e1b0ee609d5e05a8f23c51c3242f8e32ae25df09255885a812ac32bdec7874266e8a167be076c8938d90ddfe76c5b2736aa7 WHIRLPOOL e3dee1d437657939ce3290d0717f9c6f31a656de8f4642bf7fbcca1dd5b7426ba7f068f8faa96e731c863e4a8e02d1e8d1526fbf466b7ea8ba1b1682fd43ab7f DIST backintime-1.1.8.tar.gz 617754 SHA256 a1f2d210e95633dfe383eb50b3b560d1e09c43de4ce89dd4cb193cab40cb8a1e SHA512 550e270dcf341ec5ad952f4decd836007d19ff9bf60cada834dfb488dbf29954b6fd3ed80a4f8fb4406a0166895a7f7c922e5622d06c43086dd54073e5aabd99 WHIRLPOOL ea9af3c432c61def4214e1d1e2c70e40cb7e50867bb0fa08930740c13133293ad135fd6c97295ab176deaedacb33e72583dc7c34dcfc3cb375a8b6e7fc7ab632 diff --git a/app-backup/backintime/backintime-1.1.4.ebuild b/app-backup/backintime/backintime-1.1.4.ebuild deleted file mode 100644 index 6b6b5e4..0000000 --- a/app-backup/backintime/backintime-1.1.4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python3_3 python3_4 ) - -inherit eutils python-single-r1 - -DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4" -HOMEPAGE="http://backintime.le-web.org/"; -SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="qt4" - -RDEPEND="${PYTHON_DEPS} - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] - net-misc/openssh - net-misc/rsync[xattr,acl]" - -DEPEND="${RDEPEND}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-python-version-stderr.patch - - #fix doc install location - sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \ - -i common/Makefile.template || die - sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \ - -i qt4/Makefile.template || die - sed -e "/\/VERSION/d" -e "/\/LICENSE/d" -e "/\/copyright/d" \ - -i {qt4,common}/Makefile.template || die - - if [ -n ${LINGUAS+x} ] ; then - cd common/po || die - for po in *.po ; do - if ! has ${po/.po} ${LINGUAS} ; then - rm ${po} || die - fi - done - fi -} - -src_configure() { - cd "${S}"/common || die - ./configure --python3 --no-fuse-group || die - if use qt4 ; then - cd "${S}"/qt4 || die - ./configure --python3 || die - fi -} - -src_compile() { - cd "${S}"/common || die - emake - if use qt4 ; then - cd "${S}"/qt4 || die - emake - fi -} - -src_install() { - cd "${S}"/common || die - emake DESTDIR="${D}" install - if use qt4 ; then - cd "${S}"/qt4 || die - emake DESTDIR="${D}" install - fi - - python_optimize "${D}" -} diff --git a/app-backup/backintime/backintime-1.1.8.ebuild b/app-backup/backintime/backintime-1.1.8.ebuild deleted file mode 100644 index 4a3799a..0000000 --- a/app-backup/backintime/backintime-1.1.8.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python3_3 python3_4 ) - -inherit eutils python-single-r1 - -DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4" -HOMEPAGE="http://backintime.le-web.org/"; -SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="qt4" - -RDEPEND="${PYTHON_DEPS} - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] - net-misc/openssh - net-misc/rsync[xattr,acl]" - -DEPEND="${RDEPEND}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_prepare() { - #fix doc install location - sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \ - -i common/configure || die - sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \ - -i qt4/configure || die - sed -e "/addInstallFile \"..\/VERSION/d" \ - -e "/addInstallFile \"..\/LICENSE/d" \ - -e "/addInstallFile \"..\/debian\/copyright/d" \ - -i {qt4,common}/configure || die - - if [ -n ${LINGUAS+x} ] ; then - cd common/po || die - for po in *.po ; do - if ! has ${po/.po} ${LINGUAS} ; then - rm ${po} || die - fi - done - fi -} - -src_configure() { - cd "${S}"/common || die - ./configure --python3 --no-fuse-group || die - if use qt4 ; then - cd "${S}"/qt4 || die - ./configure --python3 || die - fi -} - -src_compile() { - cd "${S}"/common || die - emake - if use qt4 ; then - cd "${S}"/qt4 || die - emake - fi -} - -src_install() { - cd "${S}"/common || die - emake DESTDIR="${D}" install - if use qt4 ; then - cd "${S}"/qt4 || die - emake DESTDIR="${D}" install - fi - - python_optimize "${D}" -} diff --git a/app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch b/app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch deleted file mode 100644 index 73ba594..0000000 --- a/app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- backintime-1.0.4/common/Makefile.template -+++ backintime-1.0.4/common/Makefile.template -@@ -17,10 +17,6 @@ - install -d $(DEST)/share/backintime/plugins - install --mode=644 plugins/*.py $(DEST)/share/backintime/plugins - -- #install copyright file -- install -d $(DEST)/share/doc/backintime-common -- install --mode=644 debian_specific/copyright $(DEST)/share/doc/backintime-common -- - #install doc file(s) - install -d $(DEST)/share/doc/backintime - install --mode=644 ../AUTHORS $(DEST)/share/doc/backintime ---- backintime-1.0.24/common/Makefile.template -+++ backintime-1.0.24/common/Makefile.template -@@ -20,7 +20,6 @@ - #install doc file(s) - install -d $(DEST)/share/doc/backintime - install --mode=644 ../AUTHORS $(DEST)/share/doc/backintime -- install --mode=644 ../LICENSE $(DEST)/share/doc/backintime - install --mode=644 ../README $(DEST)/share/doc/backintime - install --mode=644 ../TRANSLATIONS $(DEST)/share/doc/backintime - install --mode=644 ../VERSION $(DEST)/share/doc/backintime ---- backintime-1.0.4/gnome/Makefile.template -+++ backintime-1.0.4/gnome/Makefile.template -@@ -15,10 +15,6 @@ - install -d $(DEST)/share/backintime/plugins - install --mode=644 plugins/*.py $(DEST)/share/backintime/plugins - -- #install copyright file -- install -d $(DEST)/share/doc/backintime-gnome -- install --mode=644 ../common/debian_specific/copyright $(DEST)/share/doc/backintime-gnome -- - #install man file(s) - install -d $(DEST)/share/man/man1 - install --mode=644 man/C/*.gz $(DEST)/share/man/man1 ---- backintime-1.0.4/kde4/Makefile.template -+++ backintime-1.0.4/kde4/Makefile.template -@@ -19,10 +19,6 @@ - install -d $(DEST)/bin - install backintime-kde4 $(DEST)/bin - -- #install copyright file -- install -d $(DEST)/share/doc/backintime-kde4 -- install --mode=644 ../common/debian_specific/copyright $(DEST)/share/doc/backintime-kde4 -- - #install .desktop file(s) - install -d $(DEST)/share/applications/kde4 - install --mode=644 *.desktop $(DEST)/share/applications/kde4 diff --git a/app-backup/backintime/files/backintime-1.0.24-wrapper.patch b/app-backup/backintime/files/backintime-1.0.24-wrapper.patch deleted file mode 100644 index fa65098..0000000 --- a/app-backup/backintime/files/backintime-1.0.24-wrapper.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- backintime-1.0.24-r2/common/backintime -+++ backintime-1.0.24-r2/common/backintime -@@ -17,15 +17,14 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --if [ -f backintime.py ]; then -- APP_PATH="." --else -- APP_PATH="/usr/share/backintime/common" --fi -+APP_PATH="/usr/share/backintime/common" - - #starting a new ssh-agent all the time is just a workaround for - #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672 - #normally this should only be necessary if run as cronjob - #and the user is not logged in --ssh-agent python $APP_PATH/backintime.py "$@" -+if [ "x$SSH_AUTH_SOCK" = "x" ]; then -+ eval "$(ssh-agent)" -+fi - -+python2 $APP_PATH/backintime.py "$@" ---- backintime-1.0.24-r2/gnome/backintime-gnome -+++ backintime-1.0.24-r2/gnome/backintime-gnome -@@ -17,14 +17,13 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --if [ -f app.py ]; then -- APP_PATH="." --else -- APP_PATH="/usr/share/backintime/gnome" --fi -+APP_PATH="/usr/share/backintime/gnome" - - #starting a new ssh-agent all the time is just a workaround for - #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672 - #normally we don't need to start ssh-agent for backintime-gnome --ssh-agent python ${APP_PATH}/app.py "$@" -+if [ "x$SSH_AUTH_SOCK" = "x" ]; then -+ eval "$(ssh-agent)" -+fi - -+python2 ${APP_PATH}/app.py "$@" ---- backintime-1.0.24-r2/kde4/backintime-kde4 -+++ backintime-1.0.24-r2/kde4/backintime-kde4 -@@ -17,11 +17,10 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --if [ -f app.py ]; then -- APP_PATH="." --else -- APP_PATH="/usr/share/backintime/kde4" -+APP_PATH="/usr/share/backintime/kde4" -+#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672 -+if [ "x$SSH_AUTH_SOCK" = "x" ]; then -+ eval "$(ssh-agent)" - fi - --python ${APP_PATH}/app.py "$@" -- -+python2 ${APP_PATH}/app.py "$@" diff --git a/app-backup/backintime/files/backintime-1.0.36-wrapper.patch b/app-backup/backintime/files/backintime-1.0.36-wrapper.patch deleted file mode 100644 index a0b0124..0000000 --- a/app-backup/backintime/files/backintime-1.0.36-wrapper.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- backintime-1.0.24-r2/common/backintime -+++ backintime-1.0.24-r2/common/backintime -@@ -17,15 +17,14 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --if [ -f backintime.py ]; then -- APP_PATH="." --else -- APP_PATH="/usr/share/backintime/common" --fi -+APP_PATH="/usr/share/backintime/common" - - #starting a new ssh-agent all the time is just a workaround for - #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672 - #normally this should only be necessary if run as cronjob - #and the user is not logged in --ssh-agent python $APP_PATH/backintime.py "$@" -+if [ "x$SSH_AUTH_SOCK" = "x" ]; then -+ eval "$(ssh-agent)" -+fi - -+python2 $APP_PATH/backintime.py "$@" ---- backintime-1.0.24-r2/gnome/backintime-gnome -+++ backintime-1.0.24-r2/gnome/backintime-gnome -@@ -17,14 +17,13 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --if [ -f app.py ]; then -- APP_PATH="." --else -- APP_PATH="/usr/share/backintime/gnome" --fi -+APP_PATH="/usr/share/backintime/gnome" - - #starting a new ssh-agent all the time is just a workaround for - #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672 - #normally we don't need to start ssh-agent for backintime-gnome --ssh-agent python ${APP_PATH}/app.py "$@" -+if [ "x$SSH_AUTH_SOCK" = "x" ]; then -+ eval "$(ssh-agent)" -+fi - -+python2 ${APP_PATH}/app.py "$@" ---- backintime-1.0.24-r2/kde4/backintime-kde4 -+++ backintime-1.0.24-r2/kde4/backintime-kde4 -@@ -17,15 +17,10 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --if [ -f app.py ]; then -- APP_PATH="." --else -- APP_PATH="/usr/share/backintime/kde4" --fi -+APP_PATH="/usr/share/backintime/kde4" - - if [ "x$SSH_AUTH_SOCK" = "x" ]; then - eval "$(ssh-agent)" - fi - --python ${APP_PATH}/app.py "$@" -- -+python2 ${APP_PATH}/app.py "$@" diff --git a/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff b/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff deleted file mode 100644 index 40831b4..0000000 --- a/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur backintime-1.0.4.orig/kde4/configure backintime-1.0.4/kde4/configure ---- backintime-1.0.4.orig/kde4/configure 2010-11-08 14:36:52.000000000 +0100 -+++ backintime-1.0.4/kde4/configure 2010-11-08 14:42:18.000000000 +0100 -@@ -16,13 +16,6 @@ - fi - fi - --#check for kdesudo (if not use kdesu) --if [ -z `which kdesudo` ]; then -- mv backintime-kde4-root.desktop.kdesudo backintime-kde4-root.desktop --else -- mv backintime-kde4-root.desktop.kdesu backintime-kde4-root.desktop --fi -- - cp Makefile.template Makefile - - echo "All OK. Now run:" diff --git a/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop b/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop deleted file mode 100644 index 54d340e..0000000 --- a/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Back In Time (root) -Exec=kdesu -c backintime-kde4 -Icon=document-save -Terminal=false -X-MultipleArgs=false -Type=Application -StartupNotify=true -Categories=Qt;KDE;System; -Comment=Simple backup system -Comment[sl]=Enostaven sistem ustvarjanja varnostnih kopij diff --git a/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch b/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch deleted file mode 100644 index ffc0d9b..0000000 --- a/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- backintime-1.1.4/common/configure -+++ backintime-1.1.4/common/configure -@@ -84,7 +84,7 @@ - done - printf "\n" >> Makefile - --if [ $(python${PYVERSION} --version | grep -c "^Python 3") -ne 1 ]; then -+if [ $(python${PYVERSION} --version 2>&1 | grep -c "^Python 3") -ne 1 ]; then - printf "Warning: Wrong Python version.\n" - printf "Please make sure Python 3.x is used by adding '--python' or '--python3'.\n" - exit 1
