Version bump.

(Portage version: 2.1.4_rc12)

4 files changed, 95 insertions, 2 deletions

diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog
index d41ca4d8eeee..c874cd593a08 100644
--- a/sys-libs/ss/ChangeLog
+++ b/sys-libs/ss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/ss
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.43 2007/12/12 01:24:40 ranger Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.44 2008/01/01 12:51:22 vapier Exp $
+
+*ss-1.40.4 (01 Jan 2008)
+
+  01 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/ss-1.40.4-check.patch, +ss-1.40.4.ebuild:
+  Version bump.
 
   12 Dec 2007; Brent Baude <ranger@gentoo.org> ss-1.40.3.ebuild:
   Marking ss-1.40.3 ppc64 stable as dep for bug 201546
diff --git a/sys-libs/ss/files/digest-ss-1.40.4 b/sys-libs/ss/files/digest-ss-1.40.4
new file mode 100644
index 000000000000..5ec37d7d3bb7
--- /dev/null
+++ b/sys-libs/ss/files/digest-ss-1.40.4
@@ -0,0 +1,3 @@
+MD5 124d744bdf9d443591eb8193c085944b e2fsprogs-1.40.4.tar.gz 4048867
+RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d9dae e2fsprogs-1.40.4.tar.gz 4048867
+SHA256 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564 e2fsprogs-1.40.4.tar.gz 4048867
diff --git a/sys-libs/ss/files/ss-1.40.4-check.patch b/sys-libs/ss/files/ss-1.40.4-check.patch
new file mode 100644
index 000000000000..147690809b48
--- /dev/null
+++ b/sys-libs/ss/files/ss-1.40.4-check.patch
@@ -0,0 +1,11 @@
+--- lib/ss/Makefile.in
++++ lib/ss/Makefile.in
+@@ -163,7 +163,7 @@
+ 		$(DESTDIR)$(man1dir)/mk_cmds.1 
+ 	$(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
+ 
+-test_ss: test_ss.o test_cmd.o $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
++test_ss: test_ss.o test_cmd.o $(LIBSS) $(LIBCOM_ERR)
+ 	@echo "	LD $@"
+ 	@$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
+ 		$(LIBSS) $(LIBCOM_ERR)
diff --git a/sys-libs/ss/ss-1.40.4.ebuild b/sys-libs/ss/ss-1.40.4.ebuild
new file mode 100644
index 000000000000..3c1740e82c49
--- /dev/null
+++ b/sys-libs/ss/ss-1.40.4.ebuild
@@ -0,0 +1,73 @@
+# 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.4.ebuild,v 1.1 2008/01/01 12:51:22 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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
+	epatch "${FILESDIR}"/${PN}-1.40.4-check.patch #201762
+}
+
+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
+
+	ln -s $(${CC} -print-file-name=libcom_err.so) lib/libcom_err.so
+	emake -j1 -C lib/ss check || die "make check failed"
+}
+
+src_install() {
+	env_setup
+
+	dodir /usr/share/man/man1
+	make -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
+}