diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-31 22:30:36 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-31 22:30:36 +0000 |
commit | 618c3037024b4e5328531cdc07c6ceb7486f5329 (patch) | |
tree | 7c9f8d50c6f5fbd53f3df583c471f5d2e5c34202 /app-misc/dvtm | |
parent | 76dfef0cec9170000357d2f354e412daf48941fc (diff) |
gentoo resync : 31.12.2017 (final resync this year)
Diffstat (limited to 'app-misc/dvtm')
-rw-r--r-- | app-misc/dvtm/Manifest | 5 | ||||
-rw-r--r-- | app-misc/dvtm/dvtm-0.15-r1.ebuild | 59 | ||||
-rw-r--r-- | app-misc/dvtm/dvtm-9999.ebuild | 32 | ||||
-rw-r--r-- | app-misc/dvtm/files/dvtm-0.15-gentoo.patch | 36 | ||||
-rw-r--r-- | app-misc/dvtm/files/dvtm-9999-gentoo.patch | 13 |
5 files changed, 124 insertions, 21 deletions
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest index 9ac62a9e8c82..13a5887d8d3c 100644 --- a/app-misc/dvtm/Manifest +++ b/app-misc/dvtm/Manifest @@ -1,6 +1,9 @@ +AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a3be90b6b896e9655dd7b1aa0b6528bb7f2fc92f40d448823990f60f5d58726e7358f6ce8304875ae2dc8903 SHA512 dd660b77457326949d41e80527fc81738c3a54f957f47d2bff94c9ee84dbbc5d2f31d43db9e85311826398c50927d18711816dfabba3ce9cddde0da66e15fe09 +AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275 DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b EBUILD dvtm-0.14.ebuild 1500 BLAKE2B 5380d05c9590229e2a1ce89b4c6344f20f87e036bd2a500e083ad65c879924b3cb90f278953ff11985ccceeeab0e31f64c489acd919a6d4d992383b216f05ada SHA512 fb1e68406859da697006b1fd0647557b18b9917b5cdfbd8af723e33cb3ffd9c61c04be2d520e79d216e341691911c46c5ac0cbb90840f20133f1be3ff987ac5a +EBUILD dvtm-0.15-r1.ebuild 1216 BLAKE2B e84166bd15f8d4c1a5f1bb80d658c6ab8521341e9a53c6b0f05aaa60fe882d5006e916c21d79065231e7a5c8b6b9502376712925d0dc834ecb65cd9967455acc SHA512 c177b2b549c85ee2797a57248ad393b7e256ee5d206fd2ae616342182455ab731d7694e4ae0bd5e67b1f24b12cbc0592fa63375fb395d0be9a8d0533c4639458 EBUILD dvtm-0.15.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79 -EBUILD dvtm-9999.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79 +EBUILD dvtm-9999.ebuild 1216 BLAKE2B b97b350b9ca2fe9f6774538c9f7c7bcbd8d0b1c66b84a3159a55feb5b913def2e93c8593f55873479e0ec955aeec1e0c26a63d91517e0a45c667f004699d9dae SHA512 361eac65bb1368285cf8bd7f6589a8d66d74c38c5dedc29338146637a70db1b78afc029b54c16c4afe73d365e1e49dc6c4b98320fe60169b50c3b68e7ef36674 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5 diff --git a/app-misc/dvtm/dvtm-0.15-r1.ebuild b/app-misc/dvtm/dvtm-0.15-r1.ebuild new file mode 100644 index 000000000000..8a4b03dec2eb --- /dev/null +++ b/app-misc/dvtm/dvtm-0.15-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit savedconfig toolchain-funcs + +DESCRIPTION="Dynamic virtual terminal manager" +HOMEPAGE="http://www.brain-dump.org/projects/dvtm/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://repo.or.cz/dvtm.git" +else + SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND="sys-libs/ncurses:0=[unicode]" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-0.15-gentoo.patch +) + +src_prepare() { + default + + restore_config config.h +} + +src_compile() { + tc-export PKG_CONFIG + local msg="" + use savedconfig && msg=", please check the configfile" + emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install + + insinto /usr/share/${PN} + newins config.h ${PF}.config.h + + dodoc README.md + + save_config config.h +} + +pkg_postinst() { + elog "This ebuild has support for user defined configs" + elog "Please read this ebuild for more details and re-emerge as needed" + elog "if you want to add or remove functionality for ${PN}" +} diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild index a579a42918d3..557a8538c0a9 100644 --- a/app-misc/dvtm/dvtm-9999.ebuild +++ b/app-misc/dvtm/dvtm-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit savedconfig toolchain-funcs @@ -18,39 +18,31 @@ fi LICENSE="MIT" SLOT="0" -IUSE="unicode" -DEPEND="sys-libs/ncurses:0=[unicode?]" -RDEPEND=${DEPEND} +RDEPEND="sys-libs/ncurses:0=[unicode]" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-9999-gentoo.patch +) src_prepare() { - sed -i \ - -e 's|FLAGS =|FLAGS +=|' \ - -e 's|-I/usr/local/include||' \ - -e 's|-L/usr/local/lib||' \ - -e 's|-Os||' \ - config.mk || die "sed config.mk failed" - use unicode || { - sed -i \ - -e 's|-lncursesw|-lncurses|' \ - config.mk || die "sed config.mk failed" - } - sed -i \ - -e '/strip/d' \ - -e 's:@tic :@tic -o ${DESTDIR}${PREFIX}/share/terminfo :g' \ - Makefile || die "sed Makefile failed" + default restore_config config.h } src_compile() { + tc-export PKG_CONFIG local msg="" use savedconfig && msg=", please check the configfile" emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}" } src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install insinto /usr/share/${PN} newins config.h ${PF}.config.h diff --git a/app-misc/dvtm/files/dvtm-0.15-gentoo.patch b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch new file mode 100644 index 000000000000..3bb7dec3721f --- /dev/null +++ b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch @@ -0,0 +1,36 @@ +--- a/config.mk ++++ b/config.mk +@@ -10,12 +10,12 @@ + TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo + + INCS = -I. +-LIBS = -lc -lutil -lncursesw +-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED ++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw) ++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED + CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS} + LDFLAGS += ${LIBS} + +-DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter ++DEBUG_CFLAGS += ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter + + CC ?= cc + STRIP ?= strip +--- a/Makefile ++++ b/Makefile +@@ -16,13 +16,13 @@ + + .c.o: + @echo CC $< +- @${CC} -c ${CFLAGS} $< ++ ${CC} -c ${CFLAGS} $< + + ${OBJ}: config.h config.mk + + dvtm: ${OBJ} + @echo CC -o $@ +- @${CC} -o $@ ${OBJ} ${LDFLAGS} ++ ${CC} -o $@ ${OBJ} ${LDFLAGS} + + debug: clean + @make CFLAGS='${DEBUG_CFLAGS}' diff --git a/app-misc/dvtm/files/dvtm-9999-gentoo.patch b/app-misc/dvtm/files/dvtm-9999-gentoo.patch new file mode 100644 index 000000000000..f29e316c3e5c --- /dev/null +++ b/app-misc/dvtm/files/dvtm-9999-gentoo.patch @@ -0,0 +1,13 @@ +--- a/config.mk ++++ b/config.mk +@@ -7,8 +7,8 @@ + TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo + + INCS = -I. +-LIBS = -lc -lutil -lncursesw +-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED ++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw) ++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED + CFLAGS += -std=c99 ${INCS} -DNDEBUG ${CPPFLAGS} + + CC ?= cc |