Fix partutil compile for FreeBSD. Make pkg_setup stuff not run on FreeBSD since it...

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index bd1b995567a1d365337ba5ede94e861f8437a736..1c39b9ee226c29de2499f9113512844acd66ed9b 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # 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.156 2007/04/11 15:19:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.157 2007/04/11 16:12:42 cardoe Exp $
+
+  11 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/0.5.9/05_freebsd_partutil_make_fix.patch, files/0.5.9/series,
+  hal-0.5.9.ebuild:
+  Fix partutil compile for FreeBSD. Make pkg_setup stuff not run on FreeBSD
+  since it's Linux specific.
 
   11 Apr 2007; Doug Goldstein <cardoe@gentoo.org> hal-0.5.9.ebuild:
   cryptsetup-luks marked as Linux only

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 163fd5b0ab834d606a206ffc6270636d0b6a3ec2..01043a0d05d34592491314a7ffab09160aa25035 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -29,6 +29,10 @@ AUX 0.5.9/04_cache_regen_return_fix.patch 662 RMD160 be35a41d815e13416301a962886
 MD5 922d80e89f199a725c772297c7a3ffe3 files/0.5.9/04_cache_regen_return_fix.patch 662
 RMD160 be35a41d815e13416301a962886d609e8c11d977 files/0.5.9/04_cache_regen_return_fix.patch 662
 SHA256 0f1996db420adde84a67c07c5cc5b7076dda6d9ca005b524dd498856585b067d files/0.5.9/04_cache_regen_return_fix.patch 662
+AUX 0.5.9/05_freebsd_partutil_make_fix.patch 481 RMD160 17cf3895f93d043aeb18c8dd6a5e3ce45b19cbee SHA1 6e339648ce325050e66bd44377f96cd0ae4b0657 SHA256 ba170af841986d9d564db6e4965a1b97e0364bd181106cd7e15b4b26c9622e54
+MD5 1ed7c7595e9d0d7a8b0a6f3d9560312c files/0.5.9/05_freebsd_partutil_make_fix.patch 481
+RMD160 17cf3895f93d043aeb18c8dd6a5e3ce45b19cbee files/0.5.9/05_freebsd_partutil_make_fix.patch 481
+SHA256 ba170af841986d9d564db6e4965a1b97e0364bd181106cd7e15b4b26c9622e54 files/0.5.9/05_freebsd_partutil_make_fix.patch 481
 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
@@ -37,10 +41,10 @@ AUX 0.5.9/96_plugdev_allow_send.patch 1781 RMD160 08f0cbb8960d4753d15d02c8694fae
 MD5 38976c1da85ba17ba6a46f56cd1de3bf files/0.5.9/96_plugdev_allow_send.patch 1781
 RMD160 08f0cbb8960d4753d15d02c8694fae09a6ef2a02 files/0.5.9/96_plugdev_allow_send.patch 1781
 SHA256 090d666c8df223fc0ea30f473fa3d52412ef22aff85c1eebf609a3f00dbd652a files/0.5.9/96_plugdev_allow_send.patch 1781
-AUX 0.5.9/series 190 RMD160 1f139fdafcfd32898b17f62503e5090cad6a6421 SHA1 70e5a9a264b54254f7129c3bcb89a34173110bd7 SHA256 ffc29c0cda42d8205501f3ab7d9d295694c5a02e993211a3363a3deca20d2493
-MD5 afe5be2721290b8f1b0c16cf7219f037 files/0.5.9/series 190
-RMD160 1f139fdafcfd32898b17f62503e5090cad6a6421 files/0.5.9/series 190
-SHA256 ffc29c0cda42d8205501f3ab7d9d295694c5a02e993211a3363a3deca20d2493 files/0.5.9/series 190
+AUX 0.5.9/series 225 RMD160 112cc6e91ba7db12aa0563e5829fda5f1ab304b9 SHA1 29ca54a2b8ca6a6cce66db31dbac0e5c6c8b76b8 SHA256 dc17fe0a3ab63c0cd2f40d999e51d639dcb2f72ca77117c57dfd10aeb47a1545
+MD5 5bbe731e6425e9cf0990467a1e319078 files/0.5.9/series 225
+RMD160 112cc6e91ba7db12aa0563e5829fda5f1ab304b9 files/0.5.9/series 225
+SHA256 dc17fe0a3ab63c0cd2f40d999e51d639dcb2f72ca77117c57dfd10aeb47a1545 files/0.5.9/series 225
 AUX fix-scsi-fake-host-event.patch 3108 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea SHA1 af1d5c9a2cde091bd7abe04ed5e91a4bb815b675 SHA256 199749c188e5fb4858e4c1dac8800525377daf6a680dcd13e7096e71266ed05d
 MD5 3b6df9a24978d931781dc029c85288a9 files/fix-scsi-fake-host-event.patch 3108
 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea files/fix-scsi-fake-host-event.patch 3108
@@ -155,14 +159,14 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498
 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426
 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426
 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426
-EBUILD hal-0.5.9.ebuild 6343 RMD160 df83115c20fa78a8ede5cd06d0dfb6cc5ca7320c SHA1 097ccc1a20cb600c2c9b633b865438f7ee9f2ed0 SHA256 446fdcae6b18c74e56d0fc1646a05fd15584bff15c64c63876d7aff777be423b
-MD5 5bae4eadfcf18c6f005731fba5d1e280 hal-0.5.9.ebuild 6343
-RMD160 df83115c20fa78a8ede5cd06d0dfb6cc5ca7320c hal-0.5.9.ebuild 6343
-SHA256 446fdcae6b18c74e56d0fc1646a05fd15584bff15c64c63876d7aff777be423b hal-0.5.9.ebuild 6343
-MISC ChangeLog 24800 RMD160 c7abcf41b7795a1830566f5e912fa38fc5a27fd8 SHA1 3a68046c59ce4acec1035014d599203c730e1941 SHA256 e5a36d9879ab700f42493083eb3968a1918ae18a155d6868506831f07acd82d3
-MD5 5981c3eedaf25a68f036d6e812ae5432 ChangeLog 24800
-RMD160 c7abcf41b7795a1830566f5e912fa38fc5a27fd8 ChangeLog 24800
-SHA256 e5a36d9879ab700f42493083eb3968a1918ae18a155d6868506831f07acd82d3 ChangeLog 24800
+EBUILD hal-0.5.9.ebuild 6383 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 SHA1 7be9f45930f7adec9278ce92489d0fec565d4859 SHA256 1734a1121bb33064e8bedadee3682947e654244b381d0032c3a28beed87c2a60
+MD5 84c3c9a869e9c860b756e033458509da hal-0.5.9.ebuild 6383
+RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 hal-0.5.9.ebuild 6383
+SHA256 1734a1121bb33064e8bedadee3682947e654244b381d0032c3a28beed87c2a60 hal-0.5.9.ebuild 6383
+MISC ChangeLog 25047 RMD160 cf27f600f4ffac76961cd835a4a27efe0e2f10fa SHA1 57bce04157818d0bb2f975e32b880035680b4134 SHA256 4337975f192546d0eefbd3fc9a0559cd5fa7371ca7aba888b8923d05bcbe74c6
+MD5 da0d64f52b96db16b5ea9d3b059a7cc1 ChangeLog 25047
+RMD160 cf27f600f4ffac76961cd835a4a27efe0e2f10fa ChangeLog 25047
+SHA256 4337975f192546d0eefbd3fc9a0559cd5fa7371ca7aba888b8923d05bcbe74c6 ChangeLog 25047
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -179,7 +183,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGHPyQoeSe8B0zEfwRArFPAJwP+2SM+0YJ6jAEkQMsziN8/pkssACggAxw
-/UsQ96hSgfp1JYtK4mKOvuo=
-=H/2a
+iD8DBQFGHQjsoeSe8B0zEfwRAkZOAJ93oHs6/zwjaf8crz9YcTWWT77bpwCfTW5e
+38uAsycRYmWFRRex2L6yh8k=
+=wxHM
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch b/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
new file mode 100644 (file)
index 0000000..6e09b69
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
@@ -0,0 +1,21 @@
+Index: b/partutil/Makefile.am
+===================================================================
+--- a/partutil/Makefile.am     2007-03-07 16:52:19.000000000 -0500
++++ b/partutil/Makefile.am     2007-04-11 12:03:45.000000000 -0400
+@@ -1,8 +1,6 @@
+-if HALD_COMPILE_SOLARIS 
+-# do nothing
+-else if HALD_COMPILE_FREEBSD
+-# do nothing
+-else 
++if HALD_COMPILE_LINUX
++noinst_LTLIBRARIES = libpartutil.la
++endif
+ 
+ INCLUDES = @GLIB_CFLAGS@
+ 
+@@ -14,4 +12,3 @@
+ 
+ clean-local :
+       rm -f *~
+-endif

diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index cb7fe35bb615d2f2443e5afb64c067c9e6b69bd2..687e2ad2d261f7ec950a4137e4151c7df3b50db9 100644 (file)
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -2,5 +2,6 @@
 02_acpi_repeated_property_change.patch
 03_crasher_fix_fail_to_return_value.patch
 04_cache_regen_return_fix.patch
+05_freebsd_partutil_make_fix.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch

diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index 0011b88b53b01e2f6c38ebcb3259b5b073286cec..ec43c42a14a50148294ebcae6b7af44c976ebfec 100644 (file)
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ b/sys-apps/hal/hal-0.5.9.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.ebuild,v 1.15 2007/04/11 15:19:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.16 2007/04/11 16:12:42 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -75,17 +75,19 @@ function notify_inotify() {
 }
 
 pkg_setup() {
-       kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer"
+       if use kernel_linux; then
+               kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer"
 
-       if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET )
-       then
-               notify_uevent
-       fi
+               if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET )
+               then
+                       notify_uevent
+               fi
 
-       linux_chkconfig_present INOTIFY_USER || notify_inotify
+               linux_chkconfig_present INOTIFY_USER || notify_inotify
 
-       if use acpi ; then
-               linux_chkconfig_present PROC_FS || notify_procfs
+               if use acpi ; then
+                       linux_chkconfig_present PROC_FS || notify_procfs
+               fi
        fi
 
        if [[ -d ${ROOT}/etc/hal/device.d ]]; then