* [gentoo-commits] repo/gentoo:master commit in: app-misc/cdctl/, app-misc/cdctl/files/
@ 2019-02-08 16:19 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2019-02-08 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 21872a01637ff7252d0a2430c5cb1a196c85faf2
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 8 16:18:55 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Feb 8 16:18:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21872a01
app-misc/cdctl: Drop old
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-misc/cdctl/Manifest | 1 -
app-misc/cdctl/cdctl-0.15.ebuild | 36 ---------------
app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch | 56 -----------------------
app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch | 13 ------
4 files changed, 106 deletions(-)
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
index 024538a2a0f..727f52824a5 100644
--- a/app-misc/cdctl/Manifest
+++ b/app-misc/cdctl/Manifest
@@ -1,2 +1 @@
-DIST cdctl-0.15.tar.gz 44163 BLAKE2B f5f3f44fabdff4446eb5d6e3fdcb12f17a4d6ee57e90f4bb772c963d89fd7b22301a6f8ae3b4f4b38f57aabd27cd68a292b96849d66c2b77741d07e129d2a8c5 SHA512 7bcaec8f52cafbe84d87dcb740a952520ceccb197b1491a88bb03d6a993a6385d424f67386a7175bb30c5c8b3ac02abf31c2e8843c1cd7d1d808eee70a5906f4
DIST cdctl-0.16.tar.gz 34121 BLAKE2B aee95efe468c215102afcd40262f0f3e9196551a661052a9f0909ca068a6b74a25f3cdb01ac62fde2f940dcd6da6e5f4a33328331723b7a14d836bcab1c0c479 SHA512 e1c341cf0acabc28c8aedb3265e65ffe90668b83eb44d23577049cc81a160ab0ec8b6e813cf8ffe20aaf83b4d056a8f07c2e958f5a6086db3843b84b36e060b4
diff --git a/app-misc/cdctl/cdctl-0.15.ebuild b/app-misc/cdctl/cdctl-0.15.ebuild
deleted file mode 100644
index 59b947b7229..00000000000
--- a/app-misc/cdctl/cdctl-0.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility to control your cd/dvd drive"
-HOMEPAGE="http://cdctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="x86 ppc amd64 ppc64"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-Makefile.in.patch
- epatch "${FILESDIR}"/${P}-cdc_ioctls.patch
-}
-
-src_compile() {
- econf
- emake CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc NEWS NUTSANDBOLTS PUBLICKEY README
-}
diff --git a/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch
deleted file mode 100644
index 6d8e11502fc..00000000000
--- a/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in.orig 2003-02-20 21:57:38.000000000 -0800
-+++ Makefile.in 2003-02-20 22:27:10.000000000 -0800
-@@ -2,10 +2,12 @@
- CFLAGS=-Wall -g
- BINS=cdctl sndreset
- OBJS=cdctl.o version.o ioctls.o iso_header.o
--DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS
-+DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README
- MANS=cdctl.1
- MOS=cdctl.mo
-
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
- bindir = @bindir@
- mandir = @mandir@
- datadir = @datadir@
-@@ -16,6 +18,10 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = $(INSTALL) -m 644
-
-+DESTDIR =
-+
-+man1dir = $(mandir)/man1
-+
- all: $(BINS)
-
- cdctl: $(OBJS)
-@@ -26,21 +32,21 @@
- version.o: version.c
- iso_header.o: iso_header.c
-
--install: install-bins install-docs install-mans install-mos
-+install: install-bins install-mans install-mos
-
- install-bins: $(BINS)
-- $(INSTALL) -s $(BINS) $(bindir)
--
--install-docs: $(DOCS)
-- $(INSTALL_DATA) $(DOCS) $(datadir)
-+ $(INSTALL) -d $(DESTDIR)$(bindir)
-+ $(INSTALL) $(BINS) $(DESTDIR)$(bindir)
-
- install-mans: $(MANS)
-- $(INSTALL_DATA) $(MANS) $(mandir)
-+ $(INSTALL) -d $(DESTDIR)$(man1dir)
-+ $(INSTALL_DATA) $(MANS) $(DESTDIR)$(man1dir)
-
- # FIXME: need to deal with other languages besides German
-
- install-mos: cdctl.mo
-- $(INSTALL_DATA) $(MOS) $(localedir)/de/LC_MESSAGES
-+ $(INSTALL) -d $(DESTDIR)$(localedir)/de/LC_MESSAGES
-+ $(INSTALL_DATA) $(MOS) $(DESTDIR)$(localedir)/de/LC_MESSAGES
-
- cdctl.mo: cdctl.po
- msgfmt cdctl.po -o cdctl.mo
diff --git a/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch b/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
deleted file mode 100644
index 8e440955907..00000000000
--- a/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurp cdctl-0.15-orig/cdctl.c cdctl-0.15/cdctl.c
---- cdctl-0.15-orig/cdctl.c 2006-08-08 23:18:44.000000000 +0200
-+++ cdctl-0.15/cdctl.c 2006-08-08 23:19:33.000000000 +0200
-@@ -337,7 +337,9 @@ int do_print_capabilities(int cdrom) {
- printf("Can report media change: %i\n", (ret & CDC_MEDIA_CHANGED)?1:0);
- printf("Can play audio discs : %i\n", (ret & CDC_PLAY_AUDIO)?1:0);
- printf("Can do a hard reset : %i\n", (ret & CDC_RESET)?1:0);
-+#ifdef CDC_IOCTLS
- printf("Has non-standard ioctls: %i\n", (ret & CDC_IOCTLS)?1:0);
-+#endif
- printf("Can report drive status: %i\n", (ret & CDC_DRIVE_STATUS)?1:0);
-
- #ifdef CDROM_CHANGER_NSLOTS
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/cdctl/, app-misc/cdctl/files/
@ 2021-05-04 22:17 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-05-04 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 2c437afd20857d4652078f520141077aa5f91533
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Apr 30 15:43:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:17:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c437afd
app-misc/cdctl: Respect CFLAGS, fix tc-directly
Closes: https://bugs.gentoo.org/722394
Closes: https://bugs.gentoo.org/779952
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-misc/cdctl/cdctl-0.16.ebuild | 7 ++++++-
app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch | 14 +++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
index e552ac85380..29c33f701e5 100644
--- a/app-misc/cdctl/cdctl-0.16.ebuild
+++ b/app-misc/cdctl/cdctl-0.16.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools
+inherit autotools toolchain-funcs
DESCRIPTION="Utility to control your cd/dvd drive"
HOMEPAGE="http://cdctl.sourceforge.net/"
@@ -20,3 +20,8 @@ src_prepare() {
default
eautoreconf
}
+
+src_configure() {
+ tc-export CC
+ default
+}
diff --git a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
index f6f4ad3abdc..ed338d7d168 100644
--- a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
+++ b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
@@ -1,9 +1,9 @@
---- cdctl/Makefile.in
-+++ cdctl/Makefile.in
-@@ -1,8 +1,8 @@
- CC=gcc
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,8 +1,7 @@
+-CC=gcc
-CFLAGS=-Wall -g
-+CFLAGS:=-Wall -g
++CFLAGS += -Wall
BINS=cdctl sndreset
OBJS=cdctl.o version.o ioctls.o iso_header.o
-DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS
@@ -11,7 +11,7 @@
# NOTE: all man pages are installed in $(mandir)/man1 -- see install-mans
MANS=cdctl.1
MOS=cdctl.mo
-@@ -22,6 +22,8 @@
+@@ -22,6 +21,8 @@ INSTALL = @INSTALL@
INSTALL_DIR = $(INSTALL) -d
INSTALL_DATA = $(INSTALL) -m 644
@@ -20,7 +20,7 @@
all: $(BINS)
cdctl: $(OBJS)
-@@ -35,25 +37,21 @@
+@@ -35,25 +36,21 @@ iso_header.o: iso_header.c
indent:
indent -kr -cdb -sc *.c
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-04 22:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-04 22:17 [gentoo-commits] repo/gentoo:master commit in: app-misc/cdctl/, app-misc/cdctl/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2019-02-08 16:19 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox