update libparted version requirements to include 1.8.7 per bug #187322

Package-Manager: portage-2.1.3_rc9

6 files changed, 75 insertions, 24 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 9a37975aec70..d4bb664c2111 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.199 2007/08/01 13:40:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.200 2007/08/01 13:51:20 cardoe Exp $
+
+  01 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/0.5.9/24_libparted_1_8_7.patch, files/0.5.9/series,
+  hal-0.5.9-r1.ebuild, hal-0.5.9.1-r1.ebuild:
+  update libparted version requirements to include 1.8.7 per bug #187322
 
   01 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
   +files/0.5.9/99_sun_disklabel_ignore.patch, -hal-0.5.7.1-r3.ebuild,
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index fd073e992642..4a776c989425 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -105,6 +105,10 @@ AUX 0.5.9/23_runner_64bit_values.patch 1126 RMD160 98d714a0fe977c42f9bbd0b395c0f
 MD5 74e5a0c77cc514212e79108180816dc0 files/0.5.9/23_runner_64bit_values.patch 1126
 RMD160 98d714a0fe977c42f9bbd0b395c0fd90e67671ab files/0.5.9/23_runner_64bit_values.patch 1126
 SHA256 38ebff891b611e04f4d2d90e49530f7380fd648f6fcd28d6a1e735d97e9ce9f8 files/0.5.9/23_runner_64bit_values.patch 1126
+AUX 0.5.9/24_libparted_1_8_7.patch 1595 RMD160 9f4a07e57244f9dd6fa81c19468d7d5000e679d6 SHA1 0c965847c14f6cc5efafe988ec783937a7d4c9c1 SHA256 b718e1ebcc761ab570c7ec96090aac845646c97471e7505ceabea8ac9846b481
+MD5 95118bf1f74294ae2aade13ab53d2c61 files/0.5.9/24_libparted_1_8_7.patch 1595
+RMD160 9f4a07e57244f9dd6fa81c19468d7d5000e679d6 files/0.5.9/24_libparted_1_8_7.patch 1595
+SHA256 b718e1ebcc761ab570c7ec96090aac845646c97471e7505ceabea8ac9846b481 files/0.5.9/24_libparted_1_8_7.patch 1595
 AUX 0.5.9/95_gentoo_man_page.patch 18159 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 SHA1 f9de30d705eada8e2f631e51b715b9923f732fb4 SHA256 59d81dcb273f3cdc9c7fc9f195331529642fef2c2150b3eeb3fd98ea555b1893
 MD5 f6d115e0eb501aba476f4df965bfeb6c files/0.5.9/95_gentoo_man_page.patch 18159
 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 files/0.5.9/95_gentoo_man_page.patch 18159
@@ -125,10 +129,10 @@ AUX 0.5.9/99_sun_disklabel_ignore.patch 841 RMD160 268f8ada789f6ff8dfce8dcc460af
 MD5 716cf856265e1a6ee44e557eca6e58e4 files/0.5.9/99_sun_disklabel_ignore.patch 841
 RMD160 268f8ada789f6ff8dfce8dcc460af4d722655be1 files/0.5.9/99_sun_disklabel_ignore.patch 841
 SHA256 16746216e574f2d257c39bea791cd6c97f4287b5666c2b041314ba5d286a923f files/0.5.9/99_sun_disklabel_ignore.patch 841
-AUX 0.5.9/series 913 RMD160 2a2b8a1f05b5c05836d2256de76b93881f641c9c SHA1 1295f0bab008dd35aec23a76d277ac2b788d7929 SHA256 6f14ceebefb7ece24416b44f88a4016a80e4a43069717bf3209bb054258cd49b
-MD5 98505549c8d42b7863533161f2fa27fe files/0.5.9/series 913
-RMD160 2a2b8a1f05b5c05836d2256de76b93881f641c9c files/0.5.9/series 913
-SHA256 6f14ceebefb7ece24416b44f88a4016a80e4a43069717bf3209bb054258cd49b files/0.5.9/series 913
+AUX 0.5.9/series 938 RMD160 6b6d5ab5357129e6588db78d251407193ef5fc7b SHA1 9d998a08e37676493386a6e0ba1e220b6ccba158 SHA256 12281e626fc5b9ee3f3b29d1233d698ad0d16e0cb7e134a89a7c3a536afaaabb
+MD5 e717cf92a61ad9ccd74e2e5500e0c0a3 files/0.5.9/series 938
+RMD160 6b6d5ab5357129e6588db78d251407193ef5fc7b files/0.5.9/series 938
+SHA256 12281e626fc5b9ee3f3b29d1233d698ad0d16e0cb7e134a89a7c3a536afaaabb files/0.5.9/series 938
 AUX hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f SHA1 c2ffb779f423e07b38f12a852d942928394abc63 SHA256 d0b713f84c7bc782ba7b13f439630a995588097db2141f4a97c110036f64001a
 MD5 521a06ba0845bd3246d6ed4b589f110f files/hal-0.5.7-hald-scripts.patch 8636
 RMD160 339765377e3573b382df987903f301860601668f files/hal-0.5.7-hald-scripts.patch 8636
@@ -224,18 +228,18 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 3c73c97453ac22538ab89eec51eda26521806c1
 MD5 587f5a6b4bd251fdf0763d7a30ec7546 hal-0.5.7.1-r5.ebuild 6426
 RMD160 3c73c97453ac22538ab89eec51eda26521806c16 hal-0.5.7.1-r5.ebuild 6426
 SHA256 f4579e19f2c36c4cc8e4e9c659363e02ba7cdb50dc292d2f055aa255bf3a7118 hal-0.5.7.1-r5.ebuild 6426
-EBUILD hal-0.5.9-r1.ebuild 8494 RMD160 fe58efe116ef6813695bdd4e4ba43b4c3fbf16d0 SHA1 609b307e50719bf78043a2fe332ddaa79c1de8bc SHA256 744df25cd7bfa05d7ff63b665d1c3c1caf2c41704672a414355d1f988458d85d
-MD5 8ad7d1d5ea9942608cc07894b5991328 hal-0.5.9-r1.ebuild 8494
-RMD160 fe58efe116ef6813695bdd4e4ba43b4c3fbf16d0 hal-0.5.9-r1.ebuild 8494
-SHA256 744df25cd7bfa05d7ff63b665d1c3c1caf2c41704672a414355d1f988458d85d hal-0.5.9-r1.ebuild 8494
-EBUILD hal-0.5.9.1-r1.ebuild 7549 RMD160 fba98604643801ddee19765a11c7c5366f6e92ab SHA1 de46196d08d6bbb299f6fe85ecd3865130f8c84d SHA256 ffb2f8403baabd78c9210136f00448f88a2eb5276253d7760e9e0b345881b495
-MD5 8d9dc402a368fc77d67b10d6727ef6c9 hal-0.5.9.1-r1.ebuild 7549
-RMD160 fba98604643801ddee19765a11c7c5366f6e92ab hal-0.5.9.1-r1.ebuild 7549
-SHA256 ffb2f8403baabd78c9210136f00448f88a2eb5276253d7760e9e0b345881b495 hal-0.5.9.1-r1.ebuild 7549
-MISC ChangeLog 32932 RMD160 60307f2583b86c1431ccddac279ebb311729effb SHA1 cbb5e514b1149c7cf01a8802d2de601952d0ba35 SHA256 69894bdaa2b3532b292d43a770bb48de4dd40787fdc7f527e9d81092d6fc3474
-MD5 0392151a73b948602156c5e3691d0a73 ChangeLog 32932
-RMD160 60307f2583b86c1431ccddac279ebb311729effb ChangeLog 32932
-SHA256 69894bdaa2b3532b292d43a770bb48de4dd40787fdc7f527e9d81092d6fc3474 ChangeLog 32932
+EBUILD hal-0.5.9-r1.ebuild 8524 RMD160 9514190e4cc7dccc57216eb3b56e0d0c17b550bd SHA1 39630b9120ffcbc6676cd7bcc89544034869318f SHA256 2ebd1e4ece922b1572fc91f3032c65cf279f8dd06b736fe1909f75eebb27a38e
+MD5 61a828b4f3dfde862382bd7fc2d2e6dd hal-0.5.9-r1.ebuild 8524
+RMD160 9514190e4cc7dccc57216eb3b56e0d0c17b550bd hal-0.5.9-r1.ebuild 8524
+SHA256 2ebd1e4ece922b1572fc91f3032c65cf279f8dd06b736fe1909f75eebb27a38e hal-0.5.9-r1.ebuild 8524
+EBUILD hal-0.5.9.1-r1.ebuild 7630 RMD160 a34edec7969e95119e639457699f9fc57c1b703a SHA1 9e4606d182834494385c80b717b4826a6fed7204 SHA256 661224ecace8c5e01f2e0d9c6728fbed55ce76f0847c37c147ce1e09d0994e47
+MD5 e497e637a54e4175fc0a24dc039ad65a hal-0.5.9.1-r1.ebuild 7630
+RMD160 a34edec7969e95119e639457699f9fc57c1b703a hal-0.5.9.1-r1.ebuild 7630
+SHA256 661224ecace8c5e01f2e0d9c6728fbed55ce76f0847c37c147ce1e09d0994e47 hal-0.5.9.1-r1.ebuild 7630
+MISC ChangeLog 33163 RMD160 9b2e970685b5347eae8ec4d35119c3af3d237eef SHA1 48e7be3cfc410a11cd9c3df62b9938c43cedc5a2 SHA256 68a92d1a603da2472b6bf009cd2c558cbd74de3fe29e65fcfea192b5903912e8
+MD5 758ebab55fb3fe6c7d8c6185fd9e8e79 ChangeLog 33163
+RMD160 9b2e970685b5347eae8ec4d35119c3af3d237eef ChangeLog 33163
+SHA256 68a92d1a603da2472b6bf009cd2c558cbd74de3fe29e65fcfea192b5903912e8 ChangeLog 33163
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -252,7 +256,7 @@ SHA256 a4b6fc77fa4c4a013240b9cb2eea17745527ec0175bd22f395733d386ae31b2b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGsI1IoeSe8B0zEfwRAuilAJ41Wd0x03rdEaZ/AfXKb6+KzHD9RACdGFmH
-QWZgMGHU94PowOoEkYIpLA0=
-=S96R
+iD8DBQFGsI/voeSe8B0zEfwRAnHzAJ9xZSgKfAGXMCvYBWHQy5o28vjxqQCfbYCh
+pt6abPnwCxzAZSWvG1oEEYc=
+=/wtJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch b/sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch
new file mode 100644
index 000000000000..7d4051b8faca
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch
@@ -0,0 +1,38 @@
+From: Danny Kukawka <danny.kukawka@web.de>
+Date: Wed, 23 May 2007 18:05:17 +0000 (+0200)
+Subject: updated allowed libparted versions
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=366ab0006278f6c23fc3c33dea7eb61a42fe941e
+
+updated allowed libparted versions
+
+Updated again the list of allowed liparted version by add v1.8.7
+---
+
+--- a/configure.in
++++ b/configure.in
+@@ -244,7 +244,7 @@ if test "x$use_parted" = "xyes" ; then
+    AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used])
+    AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
+    AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
+-   AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6])
++   AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7])
+    LDFLAGS=-lparted
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
+    #include <stdio.h>
+@@ -262,13 +262,14 @@ if test "x$use_parted" = "xyes" ; then
+ 	    (major == 1 && minor == 8 && micro == 0) ||
+ 	    (major == 1 && minor == 8 && micro == 1) ||
+ 	    (major == 1 && minor == 8 && micro == 2) ||
+-	    (major == 1 && minor == 8 && micro == 6))
++	    (major == 1 && minor == 8 && micro == 6) ||
++	    (major == 1 && minor == 8 && micro == 7))
+ 	   return 0;
+ 
+ 	return 1;
+     }
+     ]])], AC_MSG_RESULT([]),
+-       AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6]))
++       AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7]))
+     PARTED_LIBS=-lparted
+     AC_SUBST(PARTED_LIBS)
+     LDFLAGS=
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 5fd8882fc9fb..7a74ac53fd7d 100644
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -21,6 +21,7 @@
 21_pm-suspend_correct_options.patch
 22_pm-hibernate_correct_options.patch
 23_runner_64bit_values.patch
+24_libparted_1_8_7.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch
 97_ignore_fixed_drives.patch
diff --git a/sys-apps/hal/hal-0.5.9-r1.ebuild b/sys-apps/hal/hal-0.5.9-r1.ebuild
index 6dced1bbb900..ce069ff26807 100644
--- a/sys-apps/hal/hal-0.5.9-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9-r1.ebuild,v 1.13 2007/07/23 02:43:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9-r1.ebuild,v 1.14 2007/08/01 13:51:20 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -30,7 +30,8 @@ RDEPEND=">=dev-libs/glib-2.6
 		x86? ( >=sys-apps/dmidecode-2.7 )
 		ia64? ( >=sys-apps/dmidecode-2.7 )
 		dell? ( >=sys-libs/libsmbios-0.13.4 )
-		disk-partition? ( >=sys-apps/parted-1.7.1 )
+		disk-partition? ( >=sys-apps/parted-1.7.1
+						<=sys-apps/parted-1.8.6 )
 		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) )
 		selinux? ( sys-libs/libselinux
 					sec-policy/selinux-hal )"
diff --git a/sys-apps/hal/hal-0.5.9.1-r1.ebuild b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
index fa715424ed03..4ed9a59158bc 100644
--- a/sys-apps/hal/hal-0.5.9.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.2 2007/08/01 13:40:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.3 2007/08/01 13:51:20 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -30,7 +30,8 @@ RDEPEND=">=dev-libs/glib-2.6
 		x86? ( >=sys-apps/dmidecode-2.7 )
 		ia64? ( >=sys-apps/dmidecode-2.7 )
 		dell? ( >=sys-libs/libsmbios-0.13.4 )
-		disk-partition? ( >=sys-apps/parted-1.7.1 )
+		disk-partition? ( >=sys-apps/parted-1.7.1
+						<=sys-apps/parted-1.8.7 )
 		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) )
 		selinux? ( sys-libs/libselinux
 					sec-policy/selinux-hal )"
@@ -115,6 +116,7 @@ src_unpack() {
 	# Gentoo patchset
 	epatch ${FILESDIR}/0.5.9/07_malloc_h_for_stdlib_h.patch
 	epatch ${FILESDIR}/0.5.9/23_runner_64bit_values.patch
+	epatch ${FILESDIR}/0.5.9/24_libparted_1_8_7.patch
 	#epatch ${FILESDIR}/0.5.9/95_gentoo_man_page.patch
 	epatch ${FILESDIR}/0.5.9/96_plugdev_allow_send.patch
 	epatch ${FILESDIR}/0.5.9/97_ignore_fixed_drives.patch