summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-09-06 16:20:51 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-09-06 16:20:51 +0000
commit85d156b3afc63544590cca4eb1556b83e34f6e1b (patch)
tree219633b2812e0affe21352be22bf044b867436be /media-libs/jpeg
parentremove virtual/x11 from DEPEND (#104781) (diff)
downloadhistorical-85d156b3afc63544590cca4eb1556b83e34f6e1b.tar.gz
historical-85d156b3afc63544590cca4eb1556b83e34f6e1b.tar.bz2
historical-85d156b3afc63544590cca4eb1556b83e34f6e1b.zip
Remove FreeBSD patch, some other change made it pointless.
Package-Manager: portage-2.0.51.22
Diffstat (limited to 'media-libs/jpeg')
-rw-r--r--media-libs/jpeg/ChangeLog6
-rw-r--r--media-libs/jpeg/Manifest15
-rw-r--r--media-libs/jpeg/files/jpeg-6b-freebsd.patch12
-rw-r--r--media-libs/jpeg/jpeg-6b-r5.ebuild5
4 files changed, 13 insertions, 25 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index ed7232f15783..0ee90f6d2dcc 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/jpeg
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.38 2005/09/06 06:09:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.39 2005/09/06 16:20:51 flameeyes Exp $
+
+ 06 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+ -files/jpeg-6b-freebsd.patch, jpeg-6b-r5.ebuild:
+ Remove FreeBSD patch, some other change made it pointless.
06 Sep 2005; Mike Frysinger <vapier@gentoo.org>
files/jpeg-6b-gentoo.patch, jpeg-6b-r5.ebuild:
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 8a6e13279396..26d10d7c9562 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,18 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+MD5 b571faff5e2b4ac29cf574de274c9ab5 ChangeLog 5237
+MD5 ba5272e072532ba855f7b375c97f2c3e jpeg-6b-r5.ebuild 1489
MD5 3637cbaea842b04f1aa4693a1f68e286 metadata.xml 224
MD5 1199e263b7d91d0dcb0eefaae57acd4a jpeg-6b-r4.ebuild 1920
-MD5 8bb0265d9fcb807f80504b2615efc1a5 jpeg-6b-r5.ebuild 1595
-MD5 dc857a4d929f3de8e91a64f3e5c9cc51 ChangeLog 5068
-MD5 5db275bc0a1f7084ba8855a3210e32b2 files/jpeg-6b-gentoo.patch 1132
-MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r5 63
MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
-MD5 9a51d910e2d420741b9261e0ab1b8f47 files/jpeg-6b-freebsd.patch 410
+MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r5 63
+MD5 5db275bc0a1f7084ba8855a3210e32b2 files/jpeg-6b-gentoo.patch 1132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDHTKzgIKl8Uu19MoRAtJRAJ4qLOb20UGYSNfVTlA0cqg7vpPINACggAyx
-uTn8MDbdjV3PcRaQuh/RNvU=
-=shdG
+iD8DBQFDHcISj5H05b2HAEkRAtumAJ4j6j4ABXwmGp8Xq9NGKUVLmUqDzgCfe2CP
+aau1jC/GQPbOSASbnbcKWe0=
+=cf2Y
-----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/files/jpeg-6b-freebsd.patch b/media-libs/jpeg/files/jpeg-6b-freebsd.patch
deleted file mode 100644
index 8608fa1ccc40..000000000000
--- a/media-libs/jpeg/files/jpeg-6b-freebsd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig Sat Mar 21 14:08:57 1998
-+++ configure Mon Aug 4 21:49:44 2003
-@@ -1559,7 +1559,8 @@
- if test "x$LTSTATIC" = xno; then
- disable_static="--disable-static"
- fi
-- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
-+ pic_flag="-fPIC"
-+ $ac_aux_dir/ltconfig $disable_shared $disable_static $ac_aux_dir/ltmain.sh
- fi
-
- # Select memory manager depending on user input.
diff --git a/media-libs/jpeg/jpeg-6b-r5.ebuild b/media-libs/jpeg/jpeg-6b-r5.ebuild
index 27d95765e941..9fcd02f3d8a6 100644
--- a/media-libs/jpeg/jpeg-6b-r5.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r5.ebuild,v 1.6 2005/09/06 06:09:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r5.ebuild,v 1.7 2005/09/06 16:20:51 flameeyes Exp $
inherit flag-o-matic libtool eutils toolchain-funcs
@@ -22,9 +22,6 @@ src_unpack() {
unpack ${A}
cd "${S}"
- # make shared libraries work on G/FBSD. Need to be before the sed
- epatch "${FILESDIR}"/${P}-freebsd.patch
-
# allow /etc/make.conf's HOST setting to apply
sed -i 's/ltconfig.*/& $CHOST/' configure
elibtoolize