* [gentoo-commits] repo/gentoo:master commit in: x11-misc/dclock/files/, x11-misc/dclock/
@ 2017-02-19 23:46 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-02-19 23:46 UTC (permalink / raw
To: gentoo-commits
commit: b0e79863e94dc8a9c5127a7e213b873538cbfdf8
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Sun Feb 19 08:02:34 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 23:43:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e79863
x11-misc/dclock: EAPI bump 4 -> 6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4029
...-2.2.2_p4-r1.ebuild => dclock-2.2.2_p4-r2.ebuild} | 20 ++++++++++----------
x11-misc/dclock/files/dclock-2.2.2_p4-include.patch | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild b/x11-misc/dclock/dclock-2.2.2_p4-r2.ebuild
similarity index 79%
rename from x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild
rename to x11-misc/dclock/dclock-2.2.2_p4-r2.ebuild
index 7560bec1bf..d3a9fab9c0 100644
--- a/x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
+EAPI=6
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Digital clock for the X window system"
HOMEPAGE="http://packages.qa.debian.org/d/dclock.html"
@@ -33,10 +33,10 @@ DEPEND="
S=${WORKDIR}/${P/_p*/}
-src_prepare() {
- EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
- epatch "${FILESDIR}"/${P}-include.patch
-}
+PATCHES=(
+ "${WORKDIR}"/debian/patches
+ "${FILESDIR}"/${P}-include.patch
+)
src_configure() {
if use xft; then
@@ -55,17 +55,17 @@ src_compile() {
emake \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
EXTRA_LDOPTIONS="${LDFLAGS}"
}
src_install() {
- emake DESTDIR="${D}" install{,.man}
+ default
+ emake DESTDIR="${D}" install.man
insinto /usr/share/sounds
doins sounds/*
insinto /usr/share/X11/app-defaults
newins Dclock.ad DClock
-
- dodoc README TODO
}
diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
index 2fbdd884fa..223cd9f552 100644
--- a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
+++ b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
@@ -1,5 +1,5 @@
---- dclock.c
-+++ dclock.c
+--- a/dclock.c
++++ b/dclock.c
@@ -7,6 +7,7 @@
* manager: *Dclock.seconds: on
*/
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/dclock/files/, x11-misc/dclock/
@ 2021-03-15 21:39 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-15 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 066a7092fd7a4ec5fe3acd0ea7396e92a6a050eb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:29:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:34:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066a7092
x11-misc/dclock: drop 2.2.2_p9
Bug: https://bugs.gentoo.org/776442
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/dclock/Manifest | 1 -
x11-misc/dclock/dclock-2.2.2_p9.ebuild | 72 ----------------------
.../dclock/files/dclock-2.2.2_p4-include.patch | 10 ---
3 files changed, 83 deletions(-)
diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest
index 15e759bf113..aae98ba4eba 100644
--- a/x11-misc/dclock/Manifest
+++ b/x11-misc/dclock/Manifest
@@ -1,3 +1,2 @@
DIST dclock_2.2.2-12.debian.tar.xz 16112 BLAKE2B 3da6a75834791cbba71d84c8d46d65b18db6a9aa97a085d984b598c8db41fe507965390568377a9167823d0b3856165e58115aa74b05da35fd6432b44ea877e9 SHA512 c6c468a378e421fb9ef2c6e84db991644888f8d2d9afe220142ea26914423387d3aed335b43fa69b38501c3d713d5540bb2efc2e52dd0db1fa1cd3d9c00c1531
-DIST dclock_2.2.2-9.debian.tar.xz 15260 BLAKE2B dab41f4fe79d2ce6ef4effb466c3923c77a94bfaf4b6ca1dde5bd9b92e0d9ff9a5d89dd9b569f831e107bb62de691e24661609b61af84d1a64958de34304f9be SHA512 025d1d228930adb6e2b13226188b6c3d37aef59786f23826f301c7b22dabba5cfc24f76347fe2f199c239daea968cd043293bd60524110235855cb77c9e4d1f0
DIST dclock_2.2.2.orig.tar.gz 63583 BLAKE2B b1208439e3a689ff1e00cbdbfa7e3a559b7ec7705ab0834cf350d1ba1e3dcd01d4746e90999f6215cfa9e101a4bd8cf42ff324a307c792028479077152b5414b SHA512 c43ba031fd0d9ba2bc7e8fe9becc73591bfc47cd4ca931df03fa55207cfb148e24e5d702a7de5af8b67e188c561eae2fb7da14162f6a982d0abbb3251c32372c
diff --git a/x11-misc/dclock/dclock-2.2.2_p9.ebuild b/x11-misc/dclock/dclock-2.2.2_p9.ebuild
deleted file mode 100644
index 748340c6f6e..00000000000
--- a/x11-misc/dclock/dclock-2.2.2_p9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Digital clock for the X window system"
-HOMEPAGE="https://packages.qa.debian.org/d/dclock.html"
-SRC_URI="
- mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
- mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="xft"
-
-RDEPEND="
- xft? (
- media-libs/freetype
- x11-libs/libXft
- )
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXt
-"
-DEPEND="
- ${RDEPEND}
- app-text/rman
- x11-misc/imake
- xft? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${P/_p*/}
-
-PATCHES=(
- "${WORKDIR}"/debian/patches
- "${FILESDIR}"/${PN}-2.2.2_p4-include.patch
-)
-
-src_configure() {
- if use xft; then
- append-cppflags \
- -DXFT_SUPPORT \
- $( $(tc-getPKG_CONFIG) --cflags freetype2)
- else
- append-cppflags -UXFT_SUPPORT
- sed -i -e '/EXTRA_LIBRARIES/s|^|#|g' Imakefile || die
- fi
-
- xmkmf || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
- default
- emake DESTDIR="${D}" install.man
-
- insinto /usr/share/sounds
- doins sounds/*
-
- insinto /usr/share/X11/app-defaults
- newins Dclock.ad DClock
-}
diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
deleted file mode 100644
index 223cd9f5527..00000000000
--- a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/dclock.c
-+++ b/dclock.c
-@@ -7,6 +7,7 @@
- * manager: *Dclock.seconds: on
- */
- #include <stdio.h>
-+#include <stdlib.h> /* exit() */
- #include <locale.h>
- #include <X11/Intrinsic.h>
- #include "Dclock.h"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-15 21:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-19 23:46 [gentoo-commits] repo/gentoo:master commit in: x11-misc/dclock/files/, x11-misc/dclock/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-03-15 21:39 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox