Using preserve_old_lib to cut down on clutter.

4 files changed, 19 insertions, 41 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index c64f04da4538..ff83e24b047b 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.38 2004/10/02 23:56:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.39 2004/10/04 05:40:55 eradicator Exp $
+
+  03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> flac-1.1.1.ebuild:
+  Using preserve_old_lib to cut down on clutter.
 
   02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> flac-1.1.1.ebuild:
   Added in ${ROOT} and fixed up backwards compatibility...
diff --git a/media-libs/flac/flac-1.1.1.ebuild b/media-libs/flac/flac-1.1.1.ebuild
index c856ac455dad..c59a454a41dc 100644
--- a/media-libs/flac/flac-1.1.1.ebuild
+++ b/media-libs/flac/flac-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.1.ebuild,v 1.2 2004/10/02 23:56:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.1.ebuild,v 1.3 2004/10/04 05:40:55 eradicator Exp $
 
 IUSE="sse xmms"
 
@@ -54,30 +54,12 @@ src_install() {
 	dodoc AUTHORS README
 
 	# Keep around old lib
-	if [ -f ${ROOT}/usr/$(get_libdir)/libFLAC.so.4 ]; then
-		dodir /usr/$(get_libdir)
-		cp ${ROOT}/usr/$(get_libdir)/libFLAC.so.4 ${D}/usr/$(get_libdir)
-		touch ${D}/usr/$(get_libdir)/libFLAC.so.4
-		fperms 755 /usr/$(get_libdir)/libFLAC.so.4
-	fi
-	if [ -f ${ROOT}/usr/$(get_libdir)/libFLAC++.so.2 ]; then
-		dodir /usr/$(get_libdir)
-		cp ${ROOT}/usr/$(get_libdir)/libFLAC++.so.2 ${D}/usr/$(get_libdir)
-		touch ${D}/usr/$(get_libdir)/libFLAC++.so.2
-		fperms 755 /usr/$(get_libdir)/libFLAC++.so.2
-	fi
+	preserve_old_lib /usr/$(get_libdir)/libFLAC.so.4
+	preserve_old_lib /usr/$(get_libdir)/libFLAC++.so.2
 }
 
 pkg_postinst() {
-	if [ -f /usr/$(get_libdir)/libFLAC.so.4 ]; then
-		einfo "An old version of libFLAC was detected on your system."
-		einfo "In order to avoid conflicts, we've kept the old lib"
-		einfo "around.  In order to make full use of the new version"
-		einfo "of libFLAC, you will need to do the following:"
-		einfo "  revdep-rebuild --soname libFLAC.so.4"
-		einfo "  revdep-rebuild --soname libFLAC++.so.2"
-		einfo
-		einfo "After doing that, you can safely remove /usr/$(get_libdir)/libFLAC.so.4 and libFLAC++.so.2"
-	fi
+	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC.so.4
+	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC++.so.2
 }
 
diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index 8d938e565b2b..418b3e2589f1 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libexif
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.20 2004/09/29 03:09:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.21 2004/10/04 05:42:03 eradicator Exp $
+
+  03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libexif-0.6.10.ebuild:
+  Using preserve_old_lib to cut down on clutter.
 
   28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libexif-0.6.10.ebuild:
diff --git a/media-libs/libexif/libexif-0.6.10.ebuild b/media-libs/libexif/libexif-0.6.10.ebuild
index 85ead81d378f..f00e0b8f1b41 100644
--- a/media-libs/libexif/libexif-0.6.10.ebuild
+++ b/media-libs/libexif/libexif-0.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.10.ebuild,v 1.2 2004/09/29 03:09:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.10.ebuild,v 1.3 2004/10/04 05:42:03 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -30,26 +30,15 @@ src_install() {
 
 	make DESTDIR="${D}" install || die
 
-	# Keep around old lib
-	if [ -f /usr/$(get_libdir)/libexif.so.9 ]; then
-		cp /usr/$(get_libdir)/libexif.so.9 ${D}/usr/$(get_libdir)
-		fperms 755 /usr/$(get_libdir)/libexif.so.9
-	fi
-
 	dodoc ChangeLog README
 
 	# installs a blank directory for whatever broken reason
 	use nls || rm -rf ${D}/usr/share/locale
+
+	# Keep around old lib
+	preserve_old_lib /usr/$(get_libdir)/libexif.so.9
 }
 
 pkg_postinst() {
-	if [ -f /usr/$(get_libdir)/libexif.so.9 ]; then
-		einfo "An old version of libexif was detected on your system."
-		einfo "In order to avoid conflicts, we've kept the old lib"
-		einfo "around.  In order to make full use of the new version"
-		einfo "of libexif, you will need to do the following:"
-		einfo "  revdep-rebuild --soname libexif.so.9"
-		einfo
-		einfo "After doing that, you can safely remove /usr/$(get_libdir)/libexif.so.9"
-	fi
+	preserve_old_lib_notify /usr/$(get_libdir)/libexif.so.9
 }