--- /usr/portage/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.8.ebuild	2010-08-02 15:56:00.000000000 +0200
+++ xf86-input-wacom-0.10.8.ebuild	2010-08-04 15:59:18.000000000 +0200
@@ -36,14 +36,14 @@
 }
 
 src_install() {
-	x-modular_src_install
+	xorg-2_src_install
 
 	use hal || rm -fr "${D}/usr/share/hal"
 
 }
 
 pkg_postinst() {
-	x-modular_pkg_postinst
+	xorg-2_pkg_postinst
 
 	if ! linux_config_exists \
 			|| ! linux_chkconfig_present TABLET_USB_WACOM \