* [gentoo-commits] repo/gentoo:master commit in: app-backup/backintime/, app-backup/backintime/files/
@ 2020-01-01 7:55 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-01-01 7:55 UTC (permalink / raw
To: gentoo-commits
commit: 2d8b2bb2ee60846487964164b5fcda3ef4a49b09
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 20:58:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 07:55:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8b2bb2
app-backup/backintime: EAPI-7, xdg, fix QA, add missing PyQt5 RDEPENDs
Drop cd
Drop LINGUAS hack
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-backup/backintime/backintime-9999.ebuild | 87 ++++++-------
...ackintime-1.2.1-no-compress-docs-examples.patch | 142 +++++++++++++++++++++
2 files changed, 178 insertions(+), 51 deletions(-)
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
index 91c3e3acf41..fc293b01096 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,87 +1,72 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
-inherit python-single-r1 gnome2-utils git-r3
+inherit python-single-r1 git-r3 xdg
DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
-HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
EGIT_REPO_URI="https://github.com/bit-team/backintime/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="qt5"
+IUSE="examples qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/keyring[${PYTHON_USEDEP}]
net-misc/openssh
- net-misc/rsync[xattr,acl]"
+ net-misc/rsync[xattr,acl]
+"
RDEPEND="${DEPEND}
- qt5? ( dev-python/PyQt5 )"
+ qt5? ( dev-python/PyQt5[gui,widgets] )
+"
-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}-qt:/doc/${PF}:g" \
- -i qt/configure || die
- sed -e "/addInstallFile \"..\/VERSION/d" \
- -e "/addInstallFile \"..\/LICENSE/d" \
- -e "/addInstallFile \"..\/debian\/copyright/d" \
- -i {qt,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
-
- default
-}
+PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
src_configure() {
- cd "${S}"/common || die
- ./configure --python3 --no-fuse-group || die
+ pushd common > /dev/null || die
+ ./configure --python3 --no-fuse-group || die
+ popd > /dev/null || die
if use qt5 ; then
- cd "${S}"/qt || die
- ./configure --python3 || die
+ pushd qt > /dev/null || die
+ ./configure --python3 || die
+ popd > /dev/null || die
fi
}
src_compile() {
- cd "${S}"/common || die
- emake
- if use qt5 ; then
- cd "${S}"/qt || die
+ pushd common > /dev/null || die
emake
+ popd > /dev/null || die
+ if use qt5 ; then
+ pushd qt > /dev/null || die
+ emake
+ popd > /dev/null || die
fi
}
src_install() {
- cd "${S}"/common || die
- emake DESTDIR="${D}" install
- if use qt5 ; then
- cd "${S}"/qt || die
+ pushd common > /dev/null || die
emake DESTDIR="${D}" install
+ popd > /dev/null || die
+ if use qt5 ; then
+ pushd qt > /dev/null || die
+ emake DESTDIR="${D}" install
+ popd > /dev/null || die
fi
- python_optimize "${D}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
+ einstalldocs
+ if use examples ; then
+ docinto examples
+ dodoc common/{config-example-local,config-example-ssh}
+ fi
-pkg_postrm() {
- gnome2_icon_cache_update
+ python_optimize "${D}"
}
diff --git a/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch b/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch
new file mode 100644
index 00000000000..4a2fd840fda
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch
@@ -0,0 +1,142 @@
+From 897f81aefa1dfcfb8c645375e0c4baeadd39c9c0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 31 Dec 2019 22:13:23 +0100
+Subject: [PATCH] No compress, no DOCS install, no examples install, fix
+ docbook path
+
+---
+ common/configure | 36 ++++--------------------------------
+ qt/configure | 30 ++++++------------------------
+ 2 files changed, 10 insertions(+), 56 deletions(-)
+
+diff --git a/common/configure b/common/configure
+index 87cdc48..c1dd1af 100755
+--- a/common/configure
++++ b/common/configure
+@@ -166,7 +166,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+
+-printf "build:\ttranslate compress\n\n" >> ${MAKEFILE}
++printf "build:\ttranslate\n\n" >> ${MAKEFILE}
+
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -191,30 +191,11 @@ addInstallFiles "plugins/*.py" "/share/backintime/plugins"
+ addUninstallDir "/share/backintime"
+ addNewline
+
+-addComment "documentation"
+-addInstallDir "/share/doc/backintime-common"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-common"
+-addInstallFile "../AUTHORS" "/share/doc/backintime-common"
+-addInstallFile "../LICENSE" "/share/doc/backintime-common"
+-addInstallFile "../README.md" "/share/doc/backintime-common"
+-addInstallFile "../TRANSLATIONS" "/share/doc/backintime-common"
+-addInstallFile "../VERSION" "/share/doc/backintime-common"
+-addInstallFile "../CHANGES" "/share/doc/backintime-common"
+-addNewline
+-
+-addComment "config-examples"
+-addInstallDir "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-local.gz" "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-ssh.gz" "/share/doc/backintime-common/examples"
+-addUninstallDir "/share/doc/backintime-common"
+-addUninstallDir "/share/doc"
+-addNewline
+-
+ addComment "man"
+ addInstallDir "/share/man/man1"
+-addInstallFile "man/C/backintime.1.gz" "/share/man/man1"
+-addInstallFile "man/C/backintime-askpass.1.gz" "/share/man/man1"
+-addInstallFile "man/C/backintime-config.1.gz" "/share/man/man1"
++addInstallFile "man/C/backintime.1" "/share/man/man1"
++addInstallFile "man/C/backintime-askpass.1" "/share/man/man1"
++addInstallFile "man/C/backintime-config.1" "/share/man/man1"
+ addUninstallDir "/share/man"
+ addNewline
+
+@@ -238,15 +219,6 @@ addSymlink "backintime" "/share/bash-completion/completions/backinti
+ addUninstallDir "/share/bash-completion"
+ addNewline
+
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+-printf "\t#config-examples\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-local > config-example-local.gz\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-ssh > config-example-ssh.gz\n\n" >> ${MAKEFILE}
+-
+ #translate
+ printf "translate:\t$mos\n\n" >> ${MAKEFILE}
+
+diff --git a/qt/configure b/qt/configure
+index 4b56b70..8bbdfcb 100755
+--- a/qt/configure
++++ b/qt/configure
+@@ -126,7 +126,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+
+-printf "build:\tcompress\n\n" >> ${MAKEFILE}
++printf "build:\t\n\n" >> ${MAKEFILE}
+
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -174,34 +174,21 @@ addInstallFiles "net.launchpad.backintime*.policy" "/share/polkit-1/actions"
+ addUninstallDir "/share/polkit-1"
+ addNewline
+
+-addComment "documentation"
+-addInstallDir "/share/doc/backintime-qt"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-qt"
+-addInstallFile "../AUTHORS" "/share/doc/backintime-qt"
+-addInstallFile "../LICENSE" "/share/doc/backintime-qt"
+-addInstallFile "../README.md" "/share/doc/backintime-qt"
+-addInstallFile "../TRANSLATIONS" "/share/doc/backintime-qt"
+-addInstallFile "../VERSION" "/share/doc/backintime-qt"
+-addInstallFile "../CHANGES" "/share/doc/backintime-qt"
+-addNewline
+-
+ addComment ".desktop"
+ addInstallDir "/share/applications"
+ addInstallFiles "*.desktop" "/share/applications"
+ addNewline
+
+ addComment "docbook"
+-addInstallDir "/share/doc/qt/HTML/en/backintime"
+-addInstallFiles "docbook/en/*.docbook" "/share/doc/qt/HTML/en/backintime"
+-addUninstallDir "/share/doc/qt/HTML/en"
+-addUninstallDir "/share/doc/qt/HTML"
+-addUninstallDir "/share/doc/qt"
+-addUninstallDir "/share/doc"
++addInstallDir "/share/help/en/backintime"
++addInstallFiles "docbook/en/*.docbook" "/share/help/en/backintime"
++addUninstallDir "/share/help/en"
++addUninstallDir "/share/help"
+ addNewline
+
+ addComment "man"
+ addInstallDir "/share/man/man1"
+-addInstallFile "man/C/backintime-qt.1.gz" "/share/man/man1"
++addInstallFile "man/C/backintime-qt.1" "/share/man/man1"
+ addUninstallDir "/share/man"
+ addNewline
+
+@@ -216,11 +203,6 @@ addUninstallDir "/share/icons"
+ addUninstallDir "/share"
+ addNewline
+
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+ #uninstall
+ printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE}
+ printf "uninstall_files:\n" >> ${MAKEFILE}
+--
+2.24.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/backintime/, app-backup/backintime/files/
@ 2024-06-03 7:36 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-06-03 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 3c28370d267d655a11b6ee75d74e36510ee1c161
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 07:34:37 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 07:35:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c28370d
app-backup/backintime: add 1.4.3
Also, switch USE=qt5 -> USE=gui per QA policy.
Closes: https://bugs.gentoo.org/933388
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-backup/backintime/Manifest | 1 +
...kintime-9999.ebuild => backintime-1.4.3.ebuild} | 18 ++--
app-backup/backintime/backintime-9999.ebuild | 18 ++--
...ackintime-1.4.3-no-compress-docs-examples.patch | 120 +++++++++++++++++++++
4 files changed, 141 insertions(+), 16 deletions(-)
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index b5b693408960..1fc3565c4733 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1 +1,2 @@
DIST backintime-1.3.3.tar.gz 751422 BLAKE2B 5c6723d1b190c5331b8453d4cf2b14e00a4bb64777d73e3b2a1405be51ebc5418f749fca654032154f1cec2389efcd41e52c571c1f9f1f982bbd0adcb0b7dd59 SHA512 f91157133166869665c8d7475c870cd5418135e17f5e7c8ae5788eb8cd3be39e8ea3d7652aa5945f64d9906b6baed0ed3ee16eb46b81a088210459333efe9372
+DIST backintime-1.4.3.tar.gz 1900866 BLAKE2B ee9f389a7995e0ca059dab7f94ce59b2a0285bc213ffa2fcdc2d3ed2b9920762c16beb0c2d961ac922837c55fa30e1ce27a9de26c6ad0e879f5c70e876644298 SHA512 d5470590d9807c5f4c1c6f46062465ecac9432831f15d1948a95b3f7ba06015939eb292bbb53d2f039ef9e967a93b6bea0e08b928a009370995d0cc2db1f7fdf
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-1.4.3.ebuild
similarity index 86%
copy from app-backup/backintime/backintime-9999.ebuild
copy to app-backup/backintime/backintime-1.4.3.ebuild
index 27931eda4e24..80c960450f88 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-1.4.3.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="examples qt5 test"
+IUSE="examples gui test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -35,7 +35,7 @@ RDEPEND="
${DEPEND}
virtual/openssh
net-misc/rsync[xattr,acl]
- qt5? ( dev-python/PyQt5[gui,widgets] )
+ gui? ( dev-python/PyQt5[gui,widgets] )
"
BDEPEND="
sys-devel/gettext
@@ -46,7 +46,9 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.3-no-compress-docs-examples.patch"
+)
src_prepare() {
default
@@ -60,12 +62,12 @@ src_prepare() {
src_configure() {
pushd common > /dev/null || die
# Not autotools
- ./configure --python3 --no-fuse-group || die
+ ./configure --python="${PYTHON}" --no-fuse-group || die
popd > /dev/null || die
- if use qt5 ; then
+ if use gui ; then
pushd qt > /dev/null || die
- ./configure --python3 || die
+ ./configure --python="${PYTHON}" || die
popd > /dev/null || die
fi
}
@@ -73,7 +75,7 @@ src_configure() {
src_compile() {
emake -C common
- if use qt5 ; then
+ if use gui ; then
emake -C qt
fi
}
@@ -88,7 +90,7 @@ src_test() {
src_install() {
emake -C common DESTDIR="${D}" install
- if use qt5 ; then
+ if use gui ; then
emake -C qt DESTDIR="${D}" install
fi
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
index 27931eda4e24..80c960450f88 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="examples qt5 test"
+IUSE="examples gui test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -35,7 +35,7 @@ RDEPEND="
${DEPEND}
virtual/openssh
net-misc/rsync[xattr,acl]
- qt5? ( dev-python/PyQt5[gui,widgets] )
+ gui? ( dev-python/PyQt5[gui,widgets] )
"
BDEPEND="
sys-devel/gettext
@@ -46,7 +46,9 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.3-no-compress-docs-examples.patch"
+)
src_prepare() {
default
@@ -60,12 +62,12 @@ src_prepare() {
src_configure() {
pushd common > /dev/null || die
# Not autotools
- ./configure --python3 --no-fuse-group || die
+ ./configure --python="${PYTHON}" --no-fuse-group || die
popd > /dev/null || die
- if use qt5 ; then
+ if use gui ; then
pushd qt > /dev/null || die
- ./configure --python3 || die
+ ./configure --python="${PYTHON}" || die
popd > /dev/null || die
fi
}
@@ -73,7 +75,7 @@ src_configure() {
src_compile() {
emake -C common
- if use qt5 ; then
+ if use gui ; then
emake -C qt
fi
}
@@ -88,7 +90,7 @@ src_test() {
src_install() {
emake -C common DESTDIR="${D}" install
- if use qt5 ; then
+ if use gui ; then
emake -C qt DESTDIR="${D}" install
fi
diff --git a/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch b/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch
new file mode 100644
index 000000000000..9844f349b85e
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch
@@ -0,0 +1,120 @@
+--- a/common/configure
++++ b/common/configure
+@@ -161,7 +161,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+
+-printf "build:\ttranslate compress\n\n" >> ${MAKEFILE}
++printf "build:\ttranslate\n\n" >> ${MAKEFILE}
+
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -189,30 +189,11 @@ addInstallFiles "plugins/*.py" "/share/backintime/plugins"
+ addUninstallDir "/share/backintime"
+ addNewline
+
+-addComment "documentation"
+-addInstallDir "/share/doc/backintime-common"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-common"
+-addInstallFile "../AUTHORS" "/share/doc/backintime-common"
+-addInstallFile "../LICENSE" "/share/doc/backintime-common"
+-addInstallFile "../README.md" "/share/doc/backintime-common"
+-addInstallFile "../TRANSLATIONS" "/share/doc/backintime-common"
+-addInstallFile "../VERSION" "/share/doc/backintime-common"
+-addInstallFile "../CHANGES" "/share/doc/backintime-common"
+-addNewline
+-
+-addComment "config-examples"
+-addInstallDir "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-local.gz" "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-ssh.gz" "/share/doc/backintime-common/examples"
+-addUninstallDir "/share/doc/backintime-common"
+-addUninstallDir "/share/doc"
+-addNewline
+-
+ addComment "man"
+ addInstallDir "/share/man/man1"
+-addInstallFile "man/C/backintime.1.gz" "/share/man/man1"
+-addInstallFile "man/C/backintime-askpass.1.gz" "/share/man/man1"
+-addInstallFile "man/C/backintime-config.1.gz" "/share/man/man1"
++addInstallFile "man/C/backintime.1" "/share/man/man1"
++addInstallFile "man/C/backintime-askpass.1" "/share/man/man1"
++addInstallFile "man/C/backintime-config.1" "/share/man/man1"
+ addUninstallDir "/share/man"
+ addNewline
+
+@@ -236,16 +217,6 @@ addSymlink "backintime" "/share/bash-completion/completions/backinti
+ addUninstallDir "/share/bash-completion"
+ addNewline
+
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+-printf "\t#config-examples\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-local > config-example-local.gz\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-ssh > config-example-ssh.gz\n\n" >> ${MAKEFILE}
+-
+-#translate
+ printf "translate:\t$mos\n\n" >> ${MAKEFILE}
+
+ for lang in $langs; do
+--- a/qt/configure
++++ b/qt/configure
+@@ -138,7 +138,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+
+-printf "build:\tcompress\n\n" >> ${MAKEFILE}
++printf "build:\n\n" >> ${MAKEFILE}
+
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -149,7 +149,6 @@ printf "install:\n" >> ${MAKEFILE}
+
+ # Migration
+ printf "\t#clean-up installed old files that were renamed or moved in later BiT versions\n" >> ${MAKEFILE}
+-printf "\trm -f /etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf\n" >> ${MAKEFILE}
+ printf "\trm -f \$(DEST)/share/backintime/plugins/qt4plugin.py\n" >> ${MAKEFILE}
+ addNewline
+
+@@ -193,17 +192,6 @@ addInstallFiles "net.launchpad.backintime*.policy" "/share/polkit-1/actions"
+ addUninstallDir "/share/polkit-1"
+ addNewline
+
+-addComment "documentation"
+-addInstallDir "/share/doc/backintime-qt"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-qt"
+-addInstallFile "../AUTHORS" "/share/doc/backintime-qt"
+-addInstallFile "../LICENSE" "/share/doc/backintime-qt"
+-addInstallFile "../README.md" "/share/doc/backintime-qt"
+-addInstallFile "../TRANSLATIONS" "/share/doc/backintime-qt"
+-addInstallFile "../VERSION" "/share/doc/backintime-qt"
+-addInstallFile "../CHANGES" "/share/doc/backintime-qt"
+-addNewline
+-
+ addComment ".desktop"
+ addInstallDir "/share/applications"
+ addInstallFiles "*.desktop" "/share/applications"
+@@ -211,7 +199,7 @@ addNewline
+
+ addComment "man"
+ addInstallDir "/share/man/man1"
+-addInstallFile "man/C/backintime-qt.1.gz" "/share/man/man1"
++addInstallFile "man/C/backintime-qt.1" "/share/man/man1"
+ addUninstallDir "/share/man"
+ addNewline
+
+@@ -226,11 +214,6 @@ addUninstallDir "/share/icons"
+ addUninstallDir "/share"
+ addNewline
+
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+ #uninstall
+ printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE}
+ printf "uninstall_files:\n" >> ${MAKEFILE}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/backintime/, app-backup/backintime/files/
@ 2025-01-22 21:57 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-01-22 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 18ead6ebb5bacee439680ad7b5d76e0b469d6b01
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 18:20:05 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 21:56:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ead6eb
app-backup/backintime: drop 1.4.3-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-backup/backintime/Manifest | 1 -
app-backup/backintime/backintime-1.4.3-r1.ebuild | 108 -------------------
...ackintime-1.4.3-no-compress-docs-examples.patch | 120 ---------------------
3 files changed, 229 deletions(-)
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 6219bac26625..c6f444b10bf0 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,3 +1,2 @@
DIST backintime-1.3.3.tar.gz 751422 BLAKE2B 5c6723d1b190c5331b8453d4cf2b14e00a4bb64777d73e3b2a1405be51ebc5418f749fca654032154f1cec2389efcd41e52c571c1f9f1f982bbd0adcb0b7dd59 SHA512 f91157133166869665c8d7475c870cd5418135e17f5e7c8ae5788eb8cd3be39e8ea3d7652aa5945f64d9906b6baed0ed3ee16eb46b81a088210459333efe9372
-DIST backintime-1.4.3.tar.gz 1900866 BLAKE2B ee9f389a7995e0ca059dab7f94ce59b2a0285bc213ffa2fcdc2d3ed2b9920762c16beb0c2d961ac922837c55fa30e1ce27a9de26c6ad0e879f5c70e876644298 SHA512 d5470590d9807c5f4c1c6f46062465ecac9432831f15d1948a95b3f7ba06015939eb292bbb53d2f039ef9e967a93b6bea0e08b928a009370995d0cc2db1f7fdf
DIST backintime-1.5.1.tar.gz 2009248 BLAKE2B 5136b4c59f5d9e4d8e79b9e004ca666caf494d8613697a6a3ab1c9c31b42cbdcce832f821dc98adda624423101d15c787e730922da479bb7ae657cbf87375ad2 SHA512 3c629a49c5eb2e740dfdebd49d8b04cae6a15a1602a68429097d62e652c6fe18b5fdeb45460456c157a1e148cca30a220ccd4decadf7836487ba8c03f075e294
diff --git a/app-backup/backintime/backintime-1.4.3-r1.ebuild b/app-backup/backintime/backintime-1.4.3-r1.ebuild
deleted file mode 100644
index 30dfd8b1c70f..000000000000
--- a/app-backup/backintime/backintime-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit python-single-r1 xdg
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
-HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/bit-team/backintime/"
- inherit git-r3
-else
- SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples gui test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- ')
-"
-RDEPEND="
- ${DEPEND}
- virtual/openssh
- net-misc/rsync[xattr,acl]
- gui? ( dev-python/pyqt5[gui,widgets] )
-"
-BDEPEND="
- sys-devel/gettext
- test? (
- $(python_gen_cond_dep '
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- ')
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.3-no-compress-docs-examples.patch"
-)
-
-src_prepare() {
- default
-
- # Looks at host system too much, so too flaky
- rm common/test/test_tools.py || die
- # Fails with dbus/udev issue (likely sandbox)
- rm common/test/test_snapshots.py || die
-}
-
-src_configure() {
- # TODO: Review https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#dependencies
- # for deps (some may be optfeatures).
- pushd common > /dev/null || die
- # Not autotools
- ./configure --python="${PYTHON}" --no-fuse-group || die
- popd > /dev/null || die
-
- if use gui ; then
- pushd qt > /dev/null || die
- ./configure --python="${PYTHON}" || die
- popd > /dev/null || die
- fi
-}
-
-src_compile() {
- emake -C common
-
- if use gui ; then
- emake -C qt
- fi
-}
-
-src_test() {
- # pytest should work but it can't find the backintime binary, so
- # use the unittest-based runner instead.
- # https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#how-to-contribute-to-back-in-time
- emake -C common test-v
-}
-
-src_install() {
- emake -C common DESTDIR="${D}" install
-
- if use gui ; then
- emake -C qt DESTDIR="${D}" install
- fi
-
- einstalldocs
-
- if use examples ; then
- docinto examples
- dodoc common/{config-example-local,config-example-ssh}
- fi
-
- python_optimize "${D}"
-}
diff --git a/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch b/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch
deleted file mode 100644
index 9844f349b85e..000000000000
--- a/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/common/configure
-+++ b/common/configure
-@@ -161,7 +161,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
-
- printf "all:\tbuild\n\n" >> ${MAKEFILE}
-
--printf "build:\ttranslate compress\n\n" >> ${MAKEFILE}
-+printf "build:\ttranslate\n\n" >> ${MAKEFILE}
-
- printf "clean:\n" >> ${MAKEFILE}
- printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
-@@ -189,30 +189,11 @@ addInstallFiles "plugins/*.py" "/share/backintime/plugins"
- addUninstallDir "/share/backintime"
- addNewline
-
--addComment "documentation"
--addInstallDir "/share/doc/backintime-common"
--addInstallFile "../debian/copyright" "/share/doc/backintime-common"
--addInstallFile "../AUTHORS" "/share/doc/backintime-common"
--addInstallFile "../LICENSE" "/share/doc/backintime-common"
--addInstallFile "../README.md" "/share/doc/backintime-common"
--addInstallFile "../TRANSLATIONS" "/share/doc/backintime-common"
--addInstallFile "../VERSION" "/share/doc/backintime-common"
--addInstallFile "../CHANGES" "/share/doc/backintime-common"
--addNewline
--
--addComment "config-examples"
--addInstallDir "/share/doc/backintime-common/examples"
--addInstallFile "config-example-local.gz" "/share/doc/backintime-common/examples"
--addInstallFile "config-example-ssh.gz" "/share/doc/backintime-common/examples"
--addUninstallDir "/share/doc/backintime-common"
--addUninstallDir "/share/doc"
--addNewline
--
- addComment "man"
- addInstallDir "/share/man/man1"
--addInstallFile "man/C/backintime.1.gz" "/share/man/man1"
--addInstallFile "man/C/backintime-askpass.1.gz" "/share/man/man1"
--addInstallFile "man/C/backintime-config.1.gz" "/share/man/man1"
-+addInstallFile "man/C/backintime.1" "/share/man/man1"
-+addInstallFile "man/C/backintime-askpass.1" "/share/man/man1"
-+addInstallFile "man/C/backintime-config.1" "/share/man/man1"
- addUninstallDir "/share/man"
- addNewline
-
-@@ -236,16 +217,6 @@ addSymlink "backintime" "/share/bash-completion/completions/backinti
- addUninstallDir "/share/bash-completion"
- addNewline
-
--#compress
--printf "compress:\n" >> ${MAKEFILE}
--printf "\t#man pages\n" >> ${MAKEFILE}
--printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
--
--printf "\t#config-examples\n" >> ${MAKEFILE}
--printf "\tgzip -n --best -c config-example-local > config-example-local.gz\n" >> ${MAKEFILE}
--printf "\tgzip -n --best -c config-example-ssh > config-example-ssh.gz\n\n" >> ${MAKEFILE}
--
--#translate
- printf "translate:\t$mos\n\n" >> ${MAKEFILE}
-
- for lang in $langs; do
---- a/qt/configure
-+++ b/qt/configure
-@@ -138,7 +138,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
-
- printf "all:\tbuild\n\n" >> ${MAKEFILE}
-
--printf "build:\tcompress\n\n" >> ${MAKEFILE}
-+printf "build:\n\n" >> ${MAKEFILE}
-
- printf "clean:\n" >> ${MAKEFILE}
- printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
-@@ -149,7 +149,6 @@ printf "install:\n" >> ${MAKEFILE}
-
- # Migration
- printf "\t#clean-up installed old files that were renamed or moved in later BiT versions\n" >> ${MAKEFILE}
--printf "\trm -f /etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf\n" >> ${MAKEFILE}
- printf "\trm -f \$(DEST)/share/backintime/plugins/qt4plugin.py\n" >> ${MAKEFILE}
- addNewline
-
-@@ -193,17 +192,6 @@ addInstallFiles "net.launchpad.backintime*.policy" "/share/polkit-1/actions"
- addUninstallDir "/share/polkit-1"
- addNewline
-
--addComment "documentation"
--addInstallDir "/share/doc/backintime-qt"
--addInstallFile "../debian/copyright" "/share/doc/backintime-qt"
--addInstallFile "../AUTHORS" "/share/doc/backintime-qt"
--addInstallFile "../LICENSE" "/share/doc/backintime-qt"
--addInstallFile "../README.md" "/share/doc/backintime-qt"
--addInstallFile "../TRANSLATIONS" "/share/doc/backintime-qt"
--addInstallFile "../VERSION" "/share/doc/backintime-qt"
--addInstallFile "../CHANGES" "/share/doc/backintime-qt"
--addNewline
--
- addComment ".desktop"
- addInstallDir "/share/applications"
- addInstallFiles "*.desktop" "/share/applications"
-@@ -211,7 +199,7 @@ addNewline
-
- addComment "man"
- addInstallDir "/share/man/man1"
--addInstallFile "man/C/backintime-qt.1.gz" "/share/man/man1"
-+addInstallFile "man/C/backintime-qt.1" "/share/man/man1"
- addUninstallDir "/share/man"
- addNewline
-
-@@ -226,11 +214,6 @@ addUninstallDir "/share/icons"
- addUninstallDir "/share"
- addNewline
-
--#compress
--printf "compress:\n" >> ${MAKEFILE}
--printf "\t#man pages\n" >> ${MAKEFILE}
--printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
--
- #uninstall
- printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE}
- printf "uninstall_files:\n" >> ${MAKEFILE}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-22 21:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-01 7:55 [gentoo-commits] repo/gentoo:master commit in: app-backup/backintime/, app-backup/backintime/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-06-03 7:36 Sam James
2025-01-22 21:57 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox