4 files changed, 166 insertions, 2 deletions
diff --git a/sys-libs/com_err/ChangeLog b/sys-libs/com_err/ChangeLog
index 0594b396fb76..fb153f69c5b4 100644
--- a/sys-libs/com_err/ChangeLog
+++ b/sys-libs/com_err/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/com_err
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.62 2008/03/28 08:14:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.63 2008/04/27 22:22:40 vapier Exp $
+
+*com_err-1.40.9 (27 Apr 2008)
+
+  27 Apr 2008; Mike Frysinger <vapier@gentoo.org> +com_err-1.40.9.ebuild:
+  Version bump.
 
   28 Mar 2008; Jeroen Roovers <jer@gentoo.org> com_err-1.40.6.ebuild:
   Stable for HPPA too.
diff --git a/sys-libs/com_err/com_err-1.40.9.ebuild b/sys-libs/com_err/com_err-1.40.9.ebuild
new file mode 100644
index 000000000000..b2d1007b236c
--- /dev/null
+++ b/sys-libs/com_err/com_err-1.40.9.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.40.9.ebuild,v 1.1 2008/04/27 22:22:40 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="common error display library"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=""
+DEPEND="nls? ( sys-devel/gettext )
+	sys-devel/bc"
+
+S=${WORKDIR}/e2fsprogs-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.39-makefile.patch
+}
+
+src_compile() {
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
+	# We want to use the "bsd" libraries while building on Darwin, but while
+	# building on other Gentoo/*BSD we prefer elf-naming scheme.
+	local libtype
+	case ${CHOST} in
+		*-darwin*) libtype=bsd;;
+		*)         libtype=elf;;
+	esac
+
+	econf \
+		--enable-${libtype}-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !elibc_uclibc tls) \
+		$(use_enable nls) \
+		|| die
+	emake -C lib/et || die
+}
+
+src_test() {
+	make -C lib/et check || die "make check failed"
+}
+
+src_install() {
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
+	emake -C lib/et DESTDIR="${D}" install || die
+	dosed '/^ET_DIR=/s:=.*:=/usr/share/et:' /usr/bin/compile_et
+	dosym et/com_err.h /usr/include/com_err.h
+
+	dolib.a lib/libcom_err.a || die "dolib.a"
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*$(get_libname)* "${D}"/$(get_libdir)/ || die "move $(get_libname)"
+	gen_usr_ldscript libcom_err$(get_libname)
+}
+
+pkg_postinst() {
+	echo
+	ewarn "PLEASE PLEASE take note of this"
+	ewarn "Please make *sure* to run revdep-rebuild now."
+	ewarn "Certain things on your system may have linked against a different"
+	ewarn "version of com_err -- those things need to be recompiled."
+	ewarn "Sorry for the inconvenience"
+	echo
+	epause 10
+	ebeep
+}
diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog
index 0f986104ac51..457481a19839 100644
--- a/sys-libs/ss/ChangeLog
+++ b/sys-libs/ss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ss
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.56 2008/03/28 08:15:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.57 2008/04/27 22:22:44 vapier Exp $
+
+*ss-1.40.9 (27 Apr 2008)
+
+  27 Apr 2008; Mike Frysinger <vapier@gentoo.org> +ss-1.40.9.ebuild:
+  Version bump.
 
   28 Mar 2008; Jeroen Roovers <jer@gentoo.org> ss-1.40.6.ebuild:
   Stable for HPPA too.
diff --git a/sys-libs/ss/ss-1.40.9.ebuild b/sys-libs/ss/ss-1.40.9.ebuild
new file mode 100644
index 000000000000..5529a3d600f9
--- /dev/null
+++ b/sys-libs/ss/ss-1.40.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.9.ebuild,v 1.1 2008/04/27 22:22:44 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Subsystem command parsing library"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="~sys-libs/com_err-${PV}"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/e2fsprogs-${PV}
+
+env_setup() {
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.39-makefile.patch
+
+	# since we've split out com_err/ss into their own ebuilds, we
+	# need to fake out the local files.  let the toolchain find them.
+	echo "GROUP ( /usr/$(get_libdir)/libcom_err.a )" > lib/libcom_err.a
+	echo "GROUP ( /usr/$(get_libdir)/libcom_err.so )" > lib/libcom_err.so
+}
+
+src_compile() {
+	env_setup
+
+	# We want to use the "bsd" libraries while building on Darwin, but while
+	# building on other Gentoo/*BSD we prefer elf-naming scheme.
+	local libtype
+	case ${CHOST} in
+		*-darwin*) libtype=bsd;;
+		*)         libtype=elf;;
+	esac
+
+	econf \
+		--enable-${libtype}-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable nls) \
+		|| die
+	emake -C lib/ss COMPILE_ET=compile_et || die "make ss failed"
+}
+
+src_test() {
+	env_setup
+	emake -j1 -C lib/ss check || die "make check failed"
+}
+
+src_install() {
+	env_setup
+
+	dodir /usr/share/man/man1
+	emake -C lib/ss DESTDIR="${D}" install || die
+
+	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
+	# and install linker scripts to /usr/lib/.
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ || die "move .so"
+	dolib.a lib/libss.a || die "dolib.a"
+	gen_usr_ldscript libss.so
+}