Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/postgresql-base: postgresql-base-9.0.0.ebuild ChangeLog
Date: Fri, 01 Oct 2010 10:35:53
Message-Id: 20101001103547.9476B20051@flycatcher.gentoo.org
1 scarabeus 10/10/01 10:35:47
2
3 Modified: postgresql-base-9.0.0.ebuild ChangeLog
4 Log:
5 QA: Cleanup, remove useless patch. Actualy install manpages.
6
7 (Portage version: 2.2_rc88/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 dev-db/postgresql-base/postgresql-base-9.0.0.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild?r1=1.2&r2=1.3
15
16 Index: postgresql-base-9.0.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- postgresql-base-9.0.0.ebuild 20 Sep 2010 08:48:38 -0000 1.2
23 +++ postgresql-base-9.0.0.ebuild 1 Oct 2010 10:35:47 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild,v 1.2 2010/09/20 08:48:38 patrick Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild,v 1.3 2010/10/01 10:35:47 scarabeus Exp $
29
30 EAPI="2"
31
32 @@ -19,35 +19,40 @@
33
34 LICENSE="POSTGRESQL"
35 SLOT="$(get_version_component_range 1-2)"
36 -IUSE_LINGUAS="
37 - linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
38 - linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
39 - linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
40 - linguas_tr linguas_zh_CN linguas_zh_TW"
41 -IUSE="doc kerberos nls pam readline ssl threads zlib ldap pg_legacytimestamp ${IUSE_LINGUAS}"
42 +LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
43 +IUSE="doc kerberos nls pam pg_legacytimestamp readline ssl threads zlib ldap"
44 +
45 +for lingua in ${LINGUAS}; do
46 + IUSE+=" linguas_${lingua}"
47 +done
48 +
49 RESTRICT="test"
50
51 wanted_languages() {
52 - for u in ${IUSE_LINGUAS} ; do
53 - use $u && echo -n "${u#linguas_} "
54 + local enable_langs
55 +
56 + for lingua in ${LINGUAS} ; do
57 + use linguas_${lingua} && enable_langs+="${lingua} "
58 done
59 +
60 + echo -n ${enable_langs}
61 }
62
63 -RDEPEND="kerberos? ( virtual/krb5 )
64 - pam? ( virtual/pam )
65 - readline? ( >=sys-libs/readline-4.1 )
66 - ssl? ( >=dev-libs/openssl-0.9.6-r1 )
67 - zlib? ( >=sys-libs/zlib-1.1.3 )
68 - >=app-admin/eselect-postgresql-0.3
69 - virtual/libintl
70 - !!dev-db/postgresql-libs
71 +RDEPEND="!!dev-db/postgresql-libs
72 !!dev-db/postgresql-client
73 !!dev-db/libpq
74 !!dev-db/postgresql
75 - ldap? ( net-nds/openldap )"
76 + >=app-admin/eselect-postgresql-0.3
77 + virtual/libintl
78 + kerberos? ( virtual/krb5 )
79 + ldap? ( net-nds/openldap )
80 + pam? ( virtual/pam )
81 + readline? ( sys-libs/readline )
82 + ssl? ( >=dev-libs/openssl-0.9.6-r1 )
83 + zlib? ( sys-libs/zlib )"
84 DEPEND="${RDEPEND}
85 + sys-devel/bison
86 sys-devel/flex
87 - >=sys-devel/bison-1.875
88 nls? ( sys-devel/gettext )"
89 PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
90
91 @@ -55,22 +60,19 @@
92 epatch "${FILESDIR}/postgresql-9.0-common.3.patch" \
93 "${FILESDIR}/postgresql-${SLOT}-base.3.patch"
94
95 - if use kerberos && has_version "<app-crypt/heimdal-1.3.2-r1" ; then
96 - epatch "${FILESDIR}/postgresql-base-8.4-9.0-heimdal_strlcpy.patch"
97 - fi
98 -
99 # to avoid collision - it only should be installed by server
100 rm "${S}/src/backend/nls.mk"
101
102 # because psql/help.c includes the file
103 - ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
104 - cd "${S}"
105 + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
106 +
107 eautoconf
108 }
109
110 src_configure() {
111 export LDFLAGS_SL="${LDFLAGS}"
112 - econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
113 + econf \
114 + --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
115 --datadir=/usr/share/postgresql-${SLOT} \
116 --docdir=/usr/share/doc/postgresql-${SLOT} \
117 --sysconfdir=/etc/postgresql-${SLOT} \
118 @@ -85,12 +87,11 @@
119 $(use_with kerberos gssapi) \
120 "$(use_enable nls nls "$(wanted_languages)")" \
121 $(use_with pam) \
122 - $(use_enable !pg_legacytimestamp integer-datetimes ) \
123 + $(use_enable !pg_legacytimestamp integer-datetimes) \
124 $(use_with ssl openssl) \
125 $(use_enable threads thread-safety) \
126 $(use_with zlib) \
127 - $(use_with ldap) \
128 - || die "configure failed"
129 + $(use_with ldap)
130 }
131
132 src_compile() {
133 @@ -103,19 +104,19 @@
134 src_install() {
135 emake DESTDIR="${D}" install || die "emake install failed"
136 insinto /usr/include/postgresql-${SLOT}/postmaster
137 - doins "${S}"/src/include/postmaster/*.h
138 - dodir /usr/share/postgresql-${SLOT}/man/man1
139 - tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
140 + doins "${S}"/src/include/postmaster/*.h || die
141 +
142 + dodir /usr/share/postgresql-${SLOT}/man/man1/ || die
143 + cp "${S}"/doc/src/sgml/man1/* "${D}"/usr/share/postgresql-${SLOT}/man/man1/ || die
144
145 - rm -r "${D}/usr/share/doc/postgresql-${SLOT}/html"
146 rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
147 - dodoc README HISTORY doc/{README.*,TODO,bug.template}
148 + dodoc README HISTORY doc/{README.*,TODO,bug.template} || die
149
150 cd "${S}/contrib"
151 emake DESTDIR="${D}" install || die "emake install failed"
152 cd "${S}"
153
154 - dodir /etc/eselect/postgresql/slots/${SLOT}
155 + dodir /etc/eselect/postgresql/slots/${SLOT} || die
156
157 IDIR="/usr/include/postgresql-${SLOT}"
158 cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
159 @@ -133,12 +134,12 @@
160 __EOF__
161
162 cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
163 - LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
164 - MANPATH=/usr/share/postgresql-${SLOT}/man
165 - __EOF__
166 - doenvd "${T}/50postgresql-94-${SLOT}"
167 +LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
168 +MANPATH=/usr/share/postgresql-${SLOT}/man
169 +__EOF__
170 + doenvd "${T}/50postgresql-94-${SLOT}" || die
171
172 - keepdir /etc/postgresql-${SLOT}
173 + keepdir /etc/postgresql-${SLOT} || die
174 }
175
176 pkg_postinst() {
177
178
179
180 1.75 dev-db/postgresql-base/ChangeLog
181
182 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql-base/ChangeLog?rev=1.75&view=markup
183 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql-base/ChangeLog?rev=1.75&content-type=text/plain
184 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgresql-base/ChangeLog?r1=1.74&r2=1.75
185
186 Index: ChangeLog
187 ===================================================================
188 RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v
189 retrieving revision 1.74
190 retrieving revision 1.75
191 diff -u -r1.74 -r1.75
192 --- ChangeLog 21 Sep 2010 16:17:06 -0000 1.74
193 +++ ChangeLog 1 Oct 2010 10:35:47 -0000 1.75
194 @@ -1,6 +1,10 @@
195 # ChangeLog for dev-db/postgresql-base
196 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
197 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.74 2010/09/21 16:17:06 patrick Exp $
198 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.75 2010/10/01 10:35:47 scarabeus Exp $
199 +
200 + 01 Oct 2010; Tomáš Chvátal <scarabeus@g.o>
201 + postgresql-base-9.0.0.ebuild:
202 + QA: Cleanup, remove useless patch. Actualy install manpages.
203
204 21 Sep 2010; Patrick Lauer <patrick@g.o>
205 -postgresql-base-9.0_beta4.ebuild, -postgresql-base-9.0_rc1.ebuild: