[gentoo-commits] repo/gentoo:master commit in: dev-util/csup/files/, dev-util/csup/

2020-08-30 Thread David Seifert 
commit: 227c43f85e2ae65102e1e1dc79dd97e51815a9dd
Author: David Seifert  gentoo  org>
AuthorDate: Sun Aug 30 22:25:25 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 30 22:25:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227c43f8

dev-util/csup: Port to EAPI 7

Closes: https://bugs.gentoo.org/730700
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert  gentoo.org>

 dev-util/csup/csup-20060318-r1.ebuild  | 23 +
 .../csup/files/csup-20060318-respectflags.patch| 38 +-
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/dev-util/csup/csup-20060318-r1.ebuild 
b/dev-util/csup/csup-20060318-r1.ebuild
index 2c033c7d93e..109a7dc21dc 100644
--- a/dev-util/csup/csup-20060318-r1.ebuild
+++ b/dev-util/csup/csup-20060318-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A rewrite of CVSup"
 HOMEPAGE="http://www.mu.org/~mux/csup.html;
@@ -13,31 +13,26 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="
+RDEPEND="
sys-libs/zlib:0=
dev-libs/openssl:0="
-
-RDEPEND="
-   ${DEPEND}"
-
-DEPEND="
-   ${DEPEND}
-   >=sys-devel/bison-2.1"
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/bison-2.1"
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=( "${FILESDIR}/${P}-respectflags.patch")
+PATCHES=( "${FILESDIR}"/${P}-respectflags.patch )
 
 src_compile() {
# unable to work with yacc, but bison is ok.
emake \
CC="$(tc-getCC)" \
-   PREFIX=/usr \
+   PREFIX="${EPREFIX}"/usr \
YACC=bison
 }
 
 src_install() {
-   dobin "${PN}"
-   doman "${PN}.1"
+   dobin csup
+   doman csup.1
einstalldocs
 }

diff --git a/dev-util/csup/files/csup-20060318-respectflags.patch 
b/dev-util/csup/files/csup-20060318-respectflags.patch
index c95a974c75e..541622df577 100644
--- a/dev-util/csup/files/csup-20060318-respectflags.patch
+++ b/dev-util/csup/files/csup-20060318-respectflags.patch
@@ -1,22 +1,22 @@
-Index: csup/GNUmakefile
-===
 csup.orig/GNUmakefile
-+++ csup/GNUmakefile
-@@ -21,7 +21,7 @@ WARNS=   -Wall -W -Wno-unused-parameter -W
+--- a/GNUmakefile
 b/GNUmakefile
+@@ -21,22 +21,22 @@
-Wcast-align -Wunused-parameter -Wchar-subscripts -Winline \
-Wnested-externs -Wredundant-decls -Wno-format-y2k
  
 -CFLAGS+= -g -O -pipe -DNDEBUG -I$(PREFIX)/include
-+CFLAGS+= -I$(PREFIX)/include
++CPPFLAGS+= -DNDEBUG -I$(PREFIX)/include
  ifeq ($(UNAME), Linux)
-   CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+-  CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++  CPPFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
  endif
-@@ -29,14 +29,14 @@ ifeq ($(UNAME), Darwin)
-   CFLAGS+= -DHAVE_FFLAGS
+ ifeq ($(UNAME), Darwin)
+-  CFLAGS+= -DHAVE_FFLAGS
++  CPPFLAGS+= -DHAVE_FFLAGS
  endif
  CFLAGS+= $(WARNS)
 -LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
-+LIBS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
++LIBS= -lcrypto -lz -lpthread
  
  .PHONY: all clean install
  
@@ -28,11 +28,19 @@ Index: csup/GNUmakefile
  
  config.c: parse.h
  
-Index: csup/Makefile
-===
 csup.orig/Makefile
-+++ csup/Makefile
-@@ -11,7 +11,7 @@ SRCS=attrstack.c config.c detailer.c di
+@@ -49,9 +49,6 @@
+ clean:
+   rm -f csup $(OBJS) parse.c parse.h token.c csup.1.gz
+ 
+-%.o: %.c
+-  $(CC) $(CFLAGS) -c -o $@ $<
+-
+ %.c: %.y
+   $(YACC) -d -o $@ $<
+ 
+--- a/Makefile
 b/Makefile
+@@ -11,7 +11,7 @@
globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
pathcomp.c proto.c status.c stream.c threads.c token.l updater.c

[gentoo-commits] repo/gentoo:master commit in: dev-util/csup/

2018-05-21 Thread Aaron Bauman 
commit: 90b9eb965911a10813eacc560e4057eddd5a21a8
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon May 21 07:47:30 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon May 21 17:03:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b9eb96

dev-util/csup: remove old

Closes: https://github.com/gentoo/gentoo/pull/8510

 dev-util/csup/csup-20060318.ebuild | 47 --
 1 file changed, 47 deletions(-)

diff --git a/dev-util/csup/csup-20060318.ebuild 
b/dev-util/csup/csup-20060318.ebuild
deleted file mode 100644
index a551390ed1b..000
--- a/dev-util/csup/csup-20060318.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A rewrite of CVSup"
-HOMEPAGE="http://www.mu.org/~mux/csup.html;
-SRC_URI="http://mu.org/~mux/csup-snap-${PV}.tgz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-   sys-libs/zlib"
-
-RDEPEND="${DEPEND}
-   !>=sys-freebsd/freebsd-ubin-6.2_beta1"
-
-DEPEND="${DEPEND}
-   >=sys-devel/bison-2.1"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-
-   epatch "${FILESDIR}/${P}-respectflags.patch"
-}
-
-src_compile() {
-   # unable to work with yacc, but bison is ok.
-   emake \
-   CC="$(tc-getCC)" \
-   PREFIX=/usr YACC=bison || die "emake failed"
-}
-
-src_install() {
-   # instead of using make install, just copy the stuff directly
-   dobin csup || die "failed to install executable"
-   doman csup.1 || die "failed to install man page"
-   dodoc README
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/csup/

2018-03-11 Thread Patrice Clement 
commit: 7e08515bd66a0365ac2e1b41f9c92faedd36c350
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Mar 11 18:13:22 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Mar 11 18:13:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e08515b

dev-util/csup: EAPI 6 bump.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/csup/csup-20060318-r1.ebuild | 44 +++
 1 file changed, 44 insertions(+)

diff --git a/dev-util/csup/csup-20060318-r1.ebuild 
b/dev-util/csup/csup-20060318-r1.ebuild
new file mode 100644
index 000..4bd23eb5dce
--- /dev/null
+++ b/dev-util/csup/csup-20060318-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A rewrite of CVSup"
+HOMEPAGE="http://www.mu.org/~mux/csup.html;
+SRC_URI="http://mu.org/~mux/csup-snap-${PV}.tgz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+DEPEND="
+   sys-libs/zlib:0=
+   dev-libs/openssl:0="
+
+RDEPEND="
+   ${DEPEND}
+   !>=sys-freebsd/freebsd-ubin-6.2_beta1"
+
+DEPEND="
+   ${DEPEND}
+   >=sys-devel/bison-2.1"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-respectflags.patch")
+
+src_compile() {
+   # unable to work with yacc, but bison is ok.
+   emake \
+   CC="$(tc-getCC)" \
+   PREFIX=/usr \
+   YACC=bison
+}
+
+src_install() {
+   dobin "${PN}"
+   doman "${PN}.1"
+   einstalldocs
+}