[gentoo-commits] repo/gentoo:master commit in: app-backup/cdbackup/
commit: 4ced64b980a19d25e5e45288dc60a040c6a699c0
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Dec 23 09:57:04 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Dec 24 23:16:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ced64b9
app-backup/cdbackup: use https
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34440
Signed-off-by: Conrad Kostecki gentoo.org>
app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
index 89093287bfc2..84e00c74f339 100644
--- a/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
@@ -6,8 +6,8 @@ EAPI=8
inherit toolchain-funcs
DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s
or DVD(+/-RW)s"
-HOMEPAGE="http://www.muempf.de/index.html;
-SRC_URI="http://www.muempf.de/down/${P}.tar.gz;
+HOMEPAGE="https://www.muempf.de/index.html;
+SRC_URI="https://www.muempf.de/down/${P}.tar.gz;
LICENSE="BSD"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: app-backup/cdbackup/, app-backup/cdbackup/files/
commit: 2283143ca91761a86b6eb826c927d9b7d9770430
Author: David Seifert gentoo org>
AuthorDate: Sun Oct 8 12:21:54 2023 +
Commit: David Seifert gentoo org>
CommitDate: Sun Oct 8 12:21:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2283143c
app-backup/cdbackup: update EAPI 6 -> 8
Closes: https://bugs.gentoo.org/714644
Signed-off-by: David Seifert gentoo.org>
...up-0.7.1-r1.ebuild => cdbackup-0.7.1-r2.ebuild} | 21 ++
.../cdbackup/files/cdbackup-0.7.1-makefile.patch | 32 ++
.../files/cdbackup-0.7.1-u_char-musl.patch | 11
3 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
similarity index 60%
rename from app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
rename to app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
index 184aa586db4c..89093287bfc2 100644
--- a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
@@ -12,23 +12,20 @@ SRC_URI="http://www.muempf.de/down/${P}.tar.gz;
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND=">=app-cdr/cdrtools-1.11.28"
-DEPEND=""
-src_prepare() {
- sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
- "${S}"/Makefile || die "sed Makefile failed"
- default
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-u_char-musl.patch
+)
-src_compile() {
- emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+src_configure() {
+ tc-export CC
}
src_install() {
dobin cdbackup cdrestore
doman cdbackup.1 cdrestore.1
- dodoc CHANGES CREDITS README
+ einstalldocs
}
diff --git a/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch
b/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch
new file mode 100644
index ..aac8e317ce5b
--- /dev/null
+++ b/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
b/Makefile
+@@ -1,6 +1,5 @@
+ # compiler selection and options
+-CC = gcc
+-CFLAGS = -g -O2 -Wall
++CFLAGS += -Wall
+ DEPFLAGS = -MM -MG
+
+ # install location
+@@ -18,19 +17,16 @@
+
+ all: $(TARGETS)
+
+-%.o: %.c
+- $(CC) $(CFLAGS) -c $< -o $@
+-
+ $(DEPFILE): Makefile
+ @$(CC) $(DEPFLAGS) cdbackup.c cdrestore.c cdrom.c virtual.c misc.c > $@
+
+ include $(DEPFILE)
+
+ cdbackup: cdbackup.o cdrom.o virtual.o virtual-backup.o misc.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ cdrestore: cdrestore.o cdrom.o virtual.o misc.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ strip: $(TARGETS)
+ strip $(TARGETS)
diff --git a/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch
b/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch
new file mode 100644
index ..06d0d2c485ca
--- /dev/null
+++ b/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch
@@ -0,0 +1,11 @@
+--- a/virtual.h
b/virtual.h
+@@ -42,7 +42,7 @@
+ };
+
+ struct toc_entry {
+- u_char track_no;/* track number */
++ unsigned char track_no; /* track number */
+ char is_data; /* 1 = data track */
+ char is_cdbackup; /* was it created by CD-Backup? */
+ int sec_start; /* start sector */
[gentoo-commits] repo/gentoo:master commit in: app-backup/cdbackup/
commit: dcd5ff136454b428c7c717eaf1ef1ba4c667a26e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 15 13:53:54 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 15 14:52:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd5ff13
app-backup/cdbackup: Whitespace cleanup
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
b/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
index 7529285d9a6..184aa586db4 100644
--- a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ DEPEND=""
src_prepare() {
sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
-"${S}"/Makefile || die "sed Makefile failed"
+ "${S}"/Makefile || die "sed Makefile failed"
default
}
[gentoo-commits] repo/gentoo:master commit in: app-backup/cdbackup/
commit: 5e8de69d5b3d60b42a6bb26c125bf4d6431276ad
Author: Amy Liffey gentoo org>
AuthorDate: Tue Aug 8 07:00:54 2017 +
Commit: Amy Liffey gentoo org>
CommitDate: Tue Aug 8 07:01:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e8de69d
app-backup/cdbackup: EAPI 6 bump
Package-Manager: Portage-2.3.6, Repoman-2.3.1
...cdbackup-0.7.1.ebuild => cdbackup-0.7.1-r1.ebuild} | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/app-backup/cdbackup/cdbackup-0.7.1.ebuild
b/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
similarity index 59%
rename from app-backup/cdbackup/cdbackup-0.7.1.ebuild
rename to app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
index 6b91daebb67..7529285d9a6 100644
--- a/app-backup/cdbackup/cdbackup-0.7.1.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
inherit toolchain-funcs
DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s
or DVD(+/-RW)s"
@@ -15,19 +17,18 @@ IUSE=""
RDEPEND=">=app-cdr/cdrtools-1.11.28"
DEPEND=""
-src_unpack() {
- unpack ${A}
-
+src_prepare() {
sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
- "${S}"/Makefile || die "sed Makefile failed"
+"${S}"/Makefile || die "sed Makefile failed"
+ default
}
src_compile() {
- emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "make failed"
+ emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
}
src_install() {
- dobin cdbackup cdrestore || die "dobin failed"
- doman cdbackup.1 cdrestore.1 || die "doman failed"
- dodoc CHANGES CREDITS README || die "dodoc failed"
+ dobin cdbackup cdrestore
+ doman cdbackup.1 cdrestore.1
+ dodoc CHANGES CREDITS README
}
[gentoo-commits] repo/gentoo:master commit in: app-backup/cdbackup/
commit: 56b7aa540702a29cb910dec0bf80ac0100e1b2f1
Author: Manuel Rüger gentoo org>
AuthorDate: Sat Jan 2 21:16:51 2016 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sat Jan 2 21:20:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b7aa54
app-backup/cdbackup: Remove old
Package-Manager: portage-2.2.26
app-backup/cdbackup/Manifest | 1 -
app-backup/cdbackup/cdbackup-0.7.0.ebuild | 34 ---
2 files changed, 35 deletions(-)
diff --git a/app-backup/cdbackup/Manifest b/app-backup/cdbackup/Manifest
index a325475..9b05800 100644
--- a/app-backup/cdbackup/Manifest
+++ b/app-backup/cdbackup/Manifest
@@ -1,2 +1 @@
-DIST cdbackup-0.7.0.tar.gz 22004 SHA256
d960bd67cc06e972c099aca8139b3b2aa35e54d32fda1a6d58f354fb82892a5c SHA512
c64f5c9c4541384a6281ded526fe6b4e47a7912f4b6356474d89a715e8ba42eae7208a4d22f9ff1a7c1b2ce4e91cf0936b14cefba33652563a1c8236959d5ba8
WHIRLPOOL
457a1ca3efa801104b8248196b58c3873b311d3a0ac4e166238dd47017cbc18d01f000536f6c57f65934175bd4083c3fc3ad12f99232fe5a9e42a71c4e92530b
DIST cdbackup-0.7.1.tar.gz 22710 SHA256
b9d94acd0065c243b2a9d5a47af768ddae003f81a181a61155065a11bb59449c SHA512
9246295090a7d52ff452d5d24a429f2a21179e4d8deb4e9d6f2ab607dd04230830e3524f25d0180e36f62c7f7f87dec11cb3c1c01cde51708d467d6e0a4afc8f
WHIRLPOOL
4267f0b48c6835efc8ac4ee2851febdc149985fc466321c25a840a6539348941baf6c43c4e4425a4eb004c5cdf312e10a560a0e3a8ddceb4fa8442c485ec606e
diff --git a/app-backup/cdbackup/cdbackup-0.7.0.ebuild
b/app-backup/cdbackup/cdbackup-0.7.0.ebuild
deleted file mode 100644
index 542f40f..000
--- a/app-backup/cdbackup/cdbackup-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s
or DVD(+/-RW)s"
-HOMEPAGE="http://www.muempf.de/index.html;
-SRC_URI="http://www.muempf.de/down/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-cdr/cdrtools-1.11.28"
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
-
- sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
- "${S}"/Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
- dobin cdbackup cdrestore || die "dobin failed"
- doman cdbackup.1 cdrestore.1 || die "doman failed"
- dodoc CHANGES CREDITS README || die "dodoc failed"
-}
