diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-18 15:35:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-18 15:35:38 +0000 |
| commit | 33443ea3c19ba9ee179dd06cc98d8c8c6fd55fab (patch) | |
| tree | bf19ecdace64206cfc73721e79b58570b1b33016 | |
| parent | Version bump. Non-maintainer commit. Bug #283850. (diff) | |
| download | gentoo-2-33443ea3c19ba9ee179dd06cc98d8c8c6fd55fab.tar.gz gentoo-2-33443ea3c19ba9ee179dd06cc98d8c8c6fd55fab.tar.bz2 gentoo-2-33443ea3c19ba9ee179dd06cc98d8c8c6fd55fab.zip | |
More cleanup
(Portage version: 2.2_rc61/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/jpeg/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-6b-r9.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-7-r1.ebuild | 10 |
3 files changed, 13 insertions, 15 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog index 9b50ae2dfb0f..b0de5cc7b0dc 100644 --- a/media-libs/jpeg/ChangeLog +++ b/media-libs/jpeg/ChangeLog @@ -1,16 +1,14 @@ # ChangeLog for media-libs/jpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.93 2010/01/17 21:58:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.94 2010/01/18 15:35:38 ssuominen Exp $ 17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> jpeg-7.ebuild, jpeg-7-r1.ebuild: - Missing blockers for libjpeg.so.7. - - 17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> jpeg-7.ebuild: - Drop old preserve_old_lib logic, it's moved to jpeg-8 ebuild. + Missing blockers for libjpeg.so.7. Drop preserve_old_lib logic. Delete + libjpeg.so.7 in -r1 to prevent collision. 17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> jpeg-6b-r9.ebuild: - Copy stable amd64/x86 from jpeg-compat ebuild. + Move stable amd64/x86 from jpeg-compat ebuild. *jpeg-7-r1 (17 Jan 2010) diff --git a/media-libs/jpeg/jpeg-6b-r9.ebuild b/media-libs/jpeg/jpeg-6b-r9.ebuild index 5362854b0037..88caf6df50e5 100644 --- a/media-libs/jpeg/jpeg-6b-r9.ebuild +++ b/media-libs/jpeg/jpeg-6b-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v 1.2 2010/01/17 21:21:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v 1.3 2010/01/18 15:35:38 ssuominen Exp $ # this ebuild is only for the libjpeg.so.62 SONAME for ABI compat @@ -43,9 +43,3 @@ src_install() { exeinto /usr/$(get_libdir) doexe .libs/libjpeg.so.62 || die } - -pkg_preinst() { - if [ "${ROOT}"usr/$(get_libdir)/libjpeg.so.62.0.0 ] ; then - rm -f "${ROOT}"usr/$(get_libdir)/libjpeg.so.62.0.0 - fi -} diff --git a/media-libs/jpeg/jpeg-7-r1.ebuild b/media-libs/jpeg/jpeg-7-r1.ebuild index 1397d1c7632a..be3a6b64e1d2 100644 --- a/media-libs/jpeg/jpeg-7-r1.ebuild +++ b/media-libs/jpeg/jpeg-7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v 1.2 2010/01/17 21:58:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v 1.3 2010/01/18 15:35:38 ssuominen Exp $ # this ebuild is only for the libjpeg.so.7 SONAME for ABI compat @@ -18,7 +18,13 @@ SLOT="7" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="" -DEPEND="!=media-libs/jpeg-7*:0" +DEPEND="!~media-libs/jpeg-7:0" + +pkg_setup() { + if [[ -e ${ROOT}/usr/$(get_libdir)/libjpeg.so.7 ]]; then + rm -f "${ROOT}"/usr/$(get_libdir)/libjpeg.so.7 + fi +} src_prepare() { epatch "${WORKDIR}"/patch/60_all_jpeg-maxmem-sysconf.patch |