summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-02-25 20:45:09 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-02-25 20:45:09 +0000
commit8f4c30a73f54cbc6e2d56cf73cbcd837d692b6fa (patch)
treea2da63ff90fb450a7d82ef777805b684a1a7df8f /sys-libs/libtrash
parentAdd patch to fix bug #459074 (parallel build). (diff)
downloadgentoo-2-8f4c30a73f54cbc6e2d56cf73cbcd837d692b6fa.tar.gz
gentoo-2-8f4c30a73f54cbc6e2d56cf73cbcd837d692b6fa.tar.bz2
gentoo-2-8f4c30a73f54cbc6e2d56cf73cbcd837d692b6fa.zip
Add creation of missing symlink
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'sys-libs/libtrash')
-rw-r--r--sys-libs/libtrash/ChangeLog6
-rw-r--r--sys-libs/libtrash/files/libtrash-3.2-gentoo.patch3
2 files changed, 7 insertions, 2 deletions
diff --git a/sys-libs/libtrash/ChangeLog b/sys-libs/libtrash/ChangeLog
index 28d328126d27..7aaeed5fd448 100644
--- a/sys-libs/libtrash/ChangeLog
+++ b/sys-libs/libtrash/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libtrash
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.15 2013/02/03 12:45:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.16 2013/02/25 20:45:09 pinkbyte Exp $
+
+ 25 Feb 2013; Sergey Popov <pinkbyte@gentoo.org>
+ files/libtrash-3.2-gentoo.patch:
+ Add creation of missing symlink
03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/libtrash-2.2-gentoo.patch,
-files/libtrash-2.4-gentoo.patch, -libtrash-2.2.ebuild, -libtrash-2.8.ebuild,
diff --git a/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch b/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch
index 97f11e8ef533..f1dba6b03917 100644
--- a/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch
+++ b/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch
@@ -45,7 +45,7 @@ diff -Naur libtrash-3.2.orig/src/Makefile libtrash-3.2/src/Makefile
INSTLIBDIR=/usr/local/lib
SYSCONFFILE=/etc/libtrash.conf
-@@ -32,10 +32,10 @@
+@@ -32,10 +32,11 @@
-o libtrash.so.${VERSION} -ldl
install-libtrash:
@@ -55,6 +55,7 @@ diff -Naur libtrash-3.2.orig/src/Makefile libtrash-3.2/src/Makefile
- ldconfig
+ TRASH_OFF=YES install libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.${VERSION}
+ TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so
++ TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.3
+ TRASH_OFF=YES install libtrash.conf.sys --mode a=r $(DESTDIR)${SYSCONFFILE}
+# ldconfig