Attachment #215321 for bug #299796

View | Details | Raw Unified | Return to bug 299796
Collapse All | Expand All




	local retval

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
	retval=$?
	[ $retval -ne 0 ] && eend $retval && return $retval


	local retval

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"

	retval=$?
	[ $retval -eq 0 ] && eend $retval && return $retval

	ewarn "Going to shutdown the server anyway."

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -m fast"

	retval=$?
	[ $retval -eq 0 ] && eend $retval && return $retval

	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."

	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -m immediate"

	retval=$?
	[ $retval -eq 0 ] && eend $retval && return $retval

reload() {
	ebegin "Reloading PostgreSQL configuration"
	su -l ${PGUSER} \
		-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl reload"	
	eend $?
}




	# use ppc && CFLAGS="-pipe -fsigned-char"

	# eval is needed to get along with pg_config quotation of space-rich entities.
	eval econf "$(/usr/libexec/postgresql-${SLOT}/pg_config --configure)" \
		--disable-thread-safety \
		$(use_with perl) \
		$(use_with python) \

		|| die "configure failed"

	for bd in .  contrib $(use xml && echo contrib/xml2); do
		PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \
			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake in $bd failed"
	done
}

	fi

	for bd in . contrib $(use xml && echo contrib/xml2) ; do
		PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \
			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
	done



	einfo "Initializing the database ..."

	su postgres -c "/usr/libexec/postgresql-${SLOT}/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"

	einfo
	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."


src_test() {
	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
	PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \
		emake -j1 check  || die "Make check failed. See above for details."

	einfo "Yes, there are other tests which could be run."

Return to bug 299796

Lines 71-77 Link Here

(-)portage/dev-db/postgresql-server/postgresql-server-8.4.2.ebuild (-5 / +5 lines)
71	# use ppc && CFLAGS="-pipe -fsigned-char"	71	# use ppc && CFLAGS="-pipe -fsigned-char"
72		72
73	# eval is needed to get along with pg_config quotation of space-rich entities.	73	# eval is needed to get along with pg_config quotation of space-rich entities.
74	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \	74	eval econf "$(/usr/libexec/postgresql-${SLOT}/pg_config --configure)" \
75	--disable-thread-safety \	75	--disable-thread-safety \
76	$(use_with perl) \	76	$(use_with perl) \
77	$(use_with python) \	77	$(use_with python) \
Lines 86-92 Link Here
86	\|\| die "configure failed"	86	\|\| die "configure failed"
87		87
88	for bd in . contrib $(use xml && echo contrib/xml2); do	88	for bd in . contrib $(use xml && echo contrib/xml2); do
89	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \	89	PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \
90	emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \|\| die "emake in $bd failed"	90	emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \|\| die "emake in $bd failed"
91	done	91	done
92	}	92	}
Lines 99-105 Link Here
99	fi	99	fi
100		100
101	for bd in . contrib $(use xml && echo contrib/xml2) ; do	101	for bd in . contrib $(use xml && echo contrib/xml2) ; do
102	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \	102	PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \
103	emake install -C $bd -j1 DESTDIR="${D}" \|\| die "emake install in $bd failed"	103	emake install -C $bd -j1 DESTDIR="${D}" \|\| die "emake install in $bd failed"
104	done	104	done
105		105
Lines 220-226 Link Here
220		220
221	einfo "Initializing the database ..."	221	einfo "Initializing the database ..."
222		222
223	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"	223	su postgres -c "/usr/libexec/postgresql-${SLOT}/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
224		224
225	einfo	225	einfo
226	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."	226	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
Lines 234-240 Link Here
234		234
235	src_test() {	235	src_test() {
236	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"	236	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
237	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \	237	PATH="/usr/libexec/postgresql-${SLOT}:${PATH}" \
238	emake -j1 check \|\| die "Make check failed. See above for details."	238	emake -j1 check \|\| die "Make check failed. See above for details."
239		239
240	einfo "Yes, there are other tests which could be run."	240	einfo "Yes, there are other tests which could be run."

Lines 68-73 Link Here

(-)portage/dev-db/postgresql-base/postgresql-base-8.4.2.ebuild (-1 / +2 lines)
68		68
69	src_compile() {	69	src_compile() {
70	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \	70	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
		71	--bindir=/usr/libexec/postgresql-${SLOT} \
71	--datadir=/usr/share/postgresql-${SLOT} \	72	--datadir=/usr/share/postgresql-${SLOT} \
72	--docdir=/usr/share/doc/postgresql-${SLOT} \	73	--docdir=/usr/share/doc/postgresql-${SLOT} \
73	--sysconfdir=/etc/postgresql-${SLOT} \	74	--sysconfdir=/etc/postgresql-${SLOT} \
Lines 119-125 Link Here
119	postgres_ebuilds="\${postgres_ebuilds} ${PF}"	120	postgres_ebuilds="\${postgres_ebuilds} ${PF}"
120	postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}	121	postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
121	postgres_datadir=/usr/share/postgresql-${SLOT}	122	postgres_datadir=/usr/share/postgresql-${SLOT}
122	postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin	123	postgres_bindir=/usr/libexec/postgresql-${SLOT}
123	postgres_symlinks=(	124	postgres_symlinks=(
124	${IDIR} /usr/include/postgresql	125	${IDIR} /usr/include/postgresql
125	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h	126	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h

Lines 34-40 Link Here

(-)portage/dev-db/postgresql-server/files/postgresql.init-8.4 (-5 / +5 lines)
34	local retval	34	local retval
35		35
36	su -l ${PGUSER} \	36	su -l ${PGUSER} \
37	-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"	37	-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
38	retval=$?	38	retval=$?
39	[ $retval -ne 0 ] && eend $retval && return $retval	39	[ $retval -ne 0 ] && eend $retval && return $retval
40		40
Lines 59-65 Link Here
59	local retval	59	local retval
60		60
61	su -l ${PGUSER} \	61	su -l ${PGUSER} \
62	-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"	62	-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
63		63
64	retval=$?	64	retval=$?
65	[ $retval -eq 0 ] && eend $retval && return $retval	65	[ $retval -eq 0 ] && eend $retval && return $retval
Lines 68-74 Link Here
68	ewarn "Going to shutdown the server anyway."	68	ewarn "Going to shutdown the server anyway."
69		69
70	su -l ${PGUSER} \	70	su -l ${PGUSER} \
71	-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m fast"	71	-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -m fast"
72		72
73	retval=$?	73	retval=$?
74	[ $retval -eq 0 ] && eend $retval && return $retval	74	[ $retval -eq 0 ] && eend $retval && return $retval
Lines 83-89 Link Here
83	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."	83	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
84		84
85	su -l ${PGUSER} \	85	su -l ${PGUSER} \
86	-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m immediate"	86	-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl stop -m immediate"
87		87
88	retval=$?	88	retval=$?
89	[ $retval -eq 0 ] && eend $retval && return $retval	89	[ $retval -eq 0 ] && eend $retval && return $retval
Lines 95-100 Link Here
95	reload() {	95	reload() {
96	ebegin "Reloading PostgreSQL configuration"	96	ebegin "Reloading PostgreSQL configuration"
97	su -l ${PGUSER} \	97	su -l ${PGUSER} \
98	-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl reload"	98	-c "env PGDATA=\"${PGDATA}\" /usr/libexec/postgresql-8.4/pg_ctl reload"
99	eend $?	99	eend $?
100	}	100	}