Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/qdbm/
Date: Thu, 30 Mar 2017 14:32:21
Message-Id: 1490883719.52d9404f466a4b269fa7e399c9412ba749b32661.hattya@gentoo
1 commit: 52d9404f466a4b269fa7e399c9412ba749b32661
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 30 14:21:59 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 30 14:21:59 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d9404f
7
8 dev-db/qdbm: update to EAPI 6
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-db/qdbm/qdbm-1.8.78-r1.ebuild | 94 +++++++++++++++++++++++----------------
13 1 file changed, 55 insertions(+), 39 deletions(-)
14
15 diff --git a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
16 index b50def2b3ea..6f6bd6fc00d 100644
17 --- a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
18 +++ b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
19 @@ -1,9 +1,9 @@
20 # Copyright 1999-2017 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI="5"
24 +EAPI="6"
25
26 -inherit eutils java-pkg-opt-2 multilib
27 +inherit java-pkg-opt-2 perl-functions
28
29 DESCRIPTION="Quick Database Manager"
30 HOMEPAGE="http://fallabs.com/qdbm/"
31 @@ -12,91 +12,107 @@ SRC_URI="http://fallabs.com/${PN}/${P}.tar.gz"
32 LICENSE="LGPL-2.1"
33 SLOT="0"
34 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
35 -IUSE="cxx debug java perl ruby zlib"
36 +IUSE="bzip2 cxx debug java lzo perl ruby zlib"
37
38 -RDEPEND="java? ( >=virtual/jre-1.4 )
39 +RDEPEND="bzip2? ( app-arch/bzip2 )
40 + java? ( >=virtual/jre-1.4:* )
41 + lzo? ( dev-libs/lzo )
42 perl? ( dev-lang/perl )
43 - ruby? ( dev-lang/ruby )
44 + ruby? ( dev-lang/ruby:= )
45 zlib? ( sys-libs/zlib )"
46 DEPEND="${RDEPEND}
47 - java? ( >=virtual/jdk-1.4 )"
48 + java? ( >=virtual/jdk-1.4:* )"
49
50 -src_prepare() {
51 - epatch "${FILESDIR}"/${PN}-runpath.patch
52 - epatch "${FILESDIR}"/${PN}-perl.patch
53 - epatch "${FILESDIR}"/${PN}-ruby19.patch
54 - # apply flags
55 - sed -i "/^CFLAGS/s|$| ${CFLAGS}|" Makefile.in
56 - sed -i "/^OPTIMIZE/s|$| ${CFLAGS}|" perl/Makefile.in
57 - sed -i "/^CXXFLAGS/s|$| ${CXXFLAGS}|" plus/Makefile.in
58 - sed -i "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" java/Makefile.in
59 - # replace make -> $(MAKE)
60 - sed -i "s/make\( \|$\)/\$(MAKE)\1/g" \
61 - Makefile.in \
62 - {cgi,java,perl,plus,ruby}/Makefile.in
63 -}
64 +PATCHES=(
65 + "${FILESDIR}"/${PN}-perl.patch
66 + "${FILESDIR}"/${PN}-ruby19.patch
67 + "${FILESDIR}"/${PN}-runpath.patch
68 +)
69 +HTML_DOCS=( doc/. )
70
71 -qdbm_api_for() {
72 +qdbm_foreach_api() {
73 local u
74 for u in cxx java perl ruby; do
75 if ! use "${u}"; then
76 continue
77 fi
78 - if [ "${u}" = "cxx" ]; then
79 + einfo "${EBUILD_PHASE} ${u}"
80 + if [[ "${u}" == "cxx" ]]; then
81 u="plus"
82 fi
83 cd "${u}"
84 case "${EBUILD_PHASE}" in
85 configure)
86 - econf
87 + case "${u}" in
88 + cgi|java|plus)
89 + econf $(use_enable debug)
90 + ;;
91 + *)
92 + econf
93 + ;;
94 + esac
95 ;;
96 compile)
97 emake
98 ;;
99 test)
100 - emake -j1 check
101 + emake check
102 ;;
103 install)
104 emake DESTDIR="${D}" MYDATADIR=/usr/share/doc/${P}/html install
105 esac
106 - cd -
107 + cd - >/dev/null
108 done
109 }
110
111 +src_prepare() {
112 + default
113 + java-pkg-opt-2_src_prepare
114 +
115 + sed -i \
116 + -e "/^CFLAGS/s|$| ${CFLAGS}|" \
117 + -e "/^OPTIMIZE/s|$| ${CFLAGS}|" \
118 + -e "/^CXXFLAGS/s|$| ${CXXFLAGS}|" \
119 + -e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
120 + -e 's/make\( \|$\)/$(MAKE)\1/g' \
121 + Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in
122 + find -name "*~" -delete
123 +}
124 +
125 src_configure() {
126 econf \
127 + $(use_enable bzip2 bzip) \
128 $(use_enable debug) \
129 + $(use_enable lzo) \
130 $(use_enable zlib) \
131 - --enable-pthread \
132 - --enable-iconv
133 - qdbm_api_for # configure
134 + --enable-iconv \
135 + --enable-pthread
136 + qdbm_foreach_api
137 }
138
139 src_compile() {
140 - emake
141 - qdbm_api_for # compile
142 + default
143 + qdbm_foreach_api
144 }
145
146 src_test() {
147 - emake -j1 check
148 - qdbm_api_for # test
149 + default
150 + qdbm_foreach_api
151 }
152
153 src_install() {
154 - emake DESTDIR="${D}" install
155 - dodoc ChangeLog NEWS README THANKS
156 - dohtml -r doc/
157 - rm -rf "${ED}"/usr/share/${PN}
158 + default
159 + qdbm_foreach_api
160
161 - qdbm_api_for # install
162 + rm -rf "${ED}"/usr/share/${PN}
163
164 if use java; then
165 java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
166 rm -f "${ED}"/usr/$(get_libdir)/*.jar
167 fi
168 if use perl; then
169 - rm -f "${ED}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
170 - find "${ED}" -name .packlist -print0 | xargs -0 rm -f
171 + perl_delete_module_manpages
172 + perl_fix_packlist
173 fi
174
175 rm -f "${ED}"/usr/bin/*test