fix regressions from ipkg rework

- remove old glib1 lib
- rename glib2 -> glib
- rename libgdbm -> gdbm
- remove obsoleted wireless-tools, use iw
- remove upstream unmaintained slurm

make allmodconfig runs through on Debian/lenny amd64 for
alix1c target

88 files changed, 9798 insertions, 59746 deletions

diff --git a/package/Config.in b/package/Config.in
index 3db9a7631..84b8e4e68 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -175,7 +175,6 @@ source "package/mtr/Config.in"
 source "package/netperf/Config.in"
 source "package/nmap/Config.in"
 source "package/sipsak/Config.in"
-source "package/slurm/Config.in"
 source "package/tcpdump/Config.in"
 #source "package/trafshow/Config.in"
 source "package/ttcp/Config.in"
@@ -343,7 +342,6 @@ source "package/olsrd/Config.in"
 source "package/snort-wireless/Config.in"
 source "package/wifidog/Config.in"
 source "package/wireless-firmware/Config.in"
-source "package/wireless-tools/Config.in"
 source "package/wpa_supplicant/Config.in"
 endmenu
 
@@ -375,7 +373,6 @@ source "package/cgilib/Config.in"
 source "package/dbus/Config.in"
 source "package/gettext/Config.in"
 source "package/glib/Config.in"
-source "package/glib2/Config.in"
 source "package/id3lib/Config.in"
 source "package/libao/Config.in"
 source "package/libaudiofile/Config.in"
@@ -393,7 +390,7 @@ source "package/flac/Config.in"  # libflac
 source "package/freetype/Config.in"  # libfreetype
 source "package/libgcrypt/Config.in"
 source "package/libgd/Config.in"
-source "package/libgdbm/Config.in"
+source "package/gdbm/Config.in"
 source "package/libgssglue/Config.in"
 source "package/gmp/Config.in"  # libgmp
 source "package/gnutls/Config.in" ## libgnutls
@@ -443,6 +440,7 @@ source "package/libtirpc/Config.in"
 source "package/libtorrent/Config.in"
 source "package/libupnp/Config.in"
 source "package/libusb/Config.in"
+source "package/libusb-compat/Config.in"
 source "package/libvorbis/Config.in"
 source "package/libvorbisidec/Config.in"
 source "package/tcp_wrappers/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index a606e3756..81a31af4d 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -8,9 +8,9 @@ apr-util-compile: expat-compile apr-compile
 arpd-compile: libpcap-compile libdnet-compile libevent-compile
 arpwatch-compile: libpcap-compile
 atftp-compile: readline-compile ncurses-compile
-avahi-compile: libdaemon-compile expat-compile libgdbm-compile
+avahi-compile: libdaemon-compile expat-compile gdbm-compile glib-compile
 bind-compile: openssl-compile
-bitlbee-compile: libiconv-compile openssl-compile glib2-compile
+bitlbee-compile: libiconv-compile openssl-compile glib-compile
 bluez-compile: libusb-compile dbus-compile
 bogofilter-compile: libiconv-compile libdb-compile
 ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
@@ -38,11 +38,11 @@ dbus-compile: expat-compile
 deco-compile: ncurses-compile
 dhcpv6-compile: libnl-compile ncurses-compile
 digitemp-compile: libusb-compile
-dsniff-compile: libnids-compile openssl-compile libgdbm-compile
+dsniff-compile: libnids-compile openssl-compile gdbm-compile
 elinks-compile: openssl-compile
 esound-compile: libaudiofile-compile
 ettercap-compile: pcap-compile libnet-compile
-exmap-compile: glib2-compile readline-compile
+exmap-compile: glib-compile readline-compile
 fprobe-compile: libpcap-compile
 freetype-compile: zlib-compile
 gatling-compile: libowfat-compile libiconv-compile
@@ -50,7 +50,7 @@ gcc-compile: gmp-compile mpfr-compile
 gdb-compile: ncurses-compile readline-compile
 gettext-compile: libiconv-compile libpthread-compile
 gkrellmd-compile: glib-compile
-glib2-compile: gettext-compile libiconv-compile
+glib-compile: gettext-compile libiconv-compile
 gmediaserver-compile: id3lib-compile libupnp-compile
 gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
@@ -77,7 +77,7 @@ iperf-compile: uclibc++-compile
 endif
 ipsec-tools-compile: openssl-compile
 iptraf-compile: ncurses-compile
-irssi-compile: glib2-compile ncurses-compile
+irssi-compile: glib-compile ncurses-compile
 iw-compile: libnl-compile
 jamvm-compile: libffi-compile zlib-compile
 ifeq (${ADK_COMPILE_KISMET_WITH_UCLIBCXX},y)
@@ -92,10 +92,11 @@ libgcrypt-compile: libgpg-error-compile
 libgd-compile: libpng-compile jpeg-compile
 libid3tag-compile: zlib-compile
 libnet-compile: libpcap-compile
-libnids-compile: libnet-compile
+libnids-compile: libnet-compile libpcap-compile
 libp11-compile: openssl-compile libtool-compile
 libpng-compile: zlib-compile
 libshout-compile: libvorbis-compile
+libusb-compile: libusb-compat-compile
 libtorrent-compile: openssl-compile libsigc++-compile
 libvorbis-compile: libogg-compile
 libfontenc-compile: xproto-compile zlib-compile
@@ -130,7 +131,7 @@ monit-compile: openssl-compile
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
 mrd6-compile: uclibc++-compile
 endif
-mt-daapd-compile: libgdbm-compile libid3tag-compile
+mt-daapd-compile: gdbm-compile libid3tag-compile
 mtr-compile: ncurses-compile
 mutt-compile: ncurses-compile openssl-compile
 mysql-compile: ncurses-compile zlib-compile readline-compile
@@ -219,7 +220,7 @@ vim-compile: ncurses-compile
 vnc-reflector-compile: jpeg-compile zlib-compile
 vpnc-compile: libgcrypt-compile libgpg-error-compile
 vtun-compile: zlib-compile openssl-compile liblzo-compile
-wdfs-compile: openssl-compile fuse-compile neon-compile glib2-compile
+wdfs-compile: openssl-compile fuse-compile neon-compile glib-compile
 weechat-compile: ncurses-compile gnutls-compile lua-compile libiconv-compile
 wknock-compile: libpcap-compile
 ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
@@ -280,7 +281,7 @@ endif
 
 mplayer-compile: alsa-lib-compile libmad-compile libvorbis-compile faad2-compile ncurses-compile zlib-compile
 
-mpd-compile: alsa-lib-compile glib2-compile curl-compile
+mpd-compile: alsa-lib-compile glib-compile curl-compile
 ifneq ($(ADK_PACKAGE_MPD_MP3),)
 mpd-compile: libid3tag-compile libmad-compile
 endif
diff --git a/package/Makefile b/package/Makefile
index 079405854..2b107a79a 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -106,8 +106,7 @@ package-$(ADK_PACKAGE_GDB) += gdb
 package-$(ADK_PACKAGE_GDBSERVER) += gdbserver
 package-$(ADK_PACKAGE_GETTEXT) += gettext
 package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd
-package-$(ADK_COMPILE_GLIB) += glib
-package-$(ADK_PACKAGE_GLIB2) += glib2
+package-$(ADK_PACKAGE_GLIB) += glib
 ifeq (${ADK_TARGET_LIB_GLIBC},y)
 package-$(ADK_PACKAGE_GLIBC) += glibc
 endif
@@ -165,7 +164,7 @@ package-$(ADK_PACKAGE_LIBFFI) += libffi
 package-$(ADK_PACKAGE_LIBFONTENC) += libfontenc
 package-$(ADK_PACKAGE_LIBGCRYPT) += libgcrypt
 package-$(ADK_PACKAGE_LIBGD) += libgd
-package-$(ADK_PACKAGE_LIBGDBM) += libgdbm
+package-$(ADK_PACKAGE_LIBGDBM) += gdbm
 package-$(ADK_PACKAGE_LIBGPG_ERROR) += libgpg-error
 package-$(ADK_PACKAGE_LIBGSSGLUE) += libgssglue
 package-$(ADK_PACKAGE_LIBICONV) += libiconv
@@ -198,6 +197,7 @@ package-$(ADK_PACKAGE_LIBTORRENT) += libtorrent
 package-$(ADK_COMPILE_LIBTOOL) += libtool
 package-$(ADK_PACKAGE_LIBUPNP) += libupnp
 package-$(ADK_PACKAGE_LIBUSB) += libusb
+package-$(ADK_PACKAGE_LIBUSB_COMPAT) += libusb-compat
 package-$(ADK_PACKAGE_LIBVORBIS) += libvorbis
 package-$(ADK_PACKAGE_LIBVORBISIDEC) += libvorbisidec
 package-$(ADK_PACKAGE_LIBICE) += libICE
@@ -332,7 +332,6 @@ package-${ADK_PACKAGE_SHOREWALL_SHELL} += shorewall-shell
 package-$(ADK_PACKAGE_SIPROXD) += siproxd
 package-$(ADK_PACKAGE_SIPSAK) += sipsak
 package-$(ADK_PACKAGE_SISPMCTL) += sispmctl
-package-$(ADK_PACKAGE_SLURM) += slurm
 package-$(ADK_COMPILE_SNORT) += snort
 package-$(ADK_COMPILE_SNORT_WIRELESS) += snort-wireless
 package-$(ADK_PACKAGE_SOCAT) += socat
@@ -390,7 +389,6 @@ package-$(ADK_PACKAGE_WDFS) += wdfs
 package-$(ADK_PACKAGE_WEECHAT) += weechat
 package-$(ADK_PACKAGE_WIFIDOG) += wifidog
 package-$(ADK_DOWNLOAD_WIRELESS_FIRMWARE) += wireless-firmware
-package-$(ADK_PACKAGE_WIRELESS_TOOLS) += wireless-tools
 package-$(ADK_PACKAGE_WOL) += wol
 package-$(ADK_PACKAGE_WONDERSHAPER) += wondershaper
 package-$(ADK_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant
diff --git a/package/apr/Makefile b/package/apr/Makefile
index bfe4f5b8f..6917bb2bd 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -46,9 +46,6 @@ post-install:
 	${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/
 	# we need to patch paths to get apr-util compiling
 	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
-	$(SED) "s,\(^libdir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
 	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
-	$(SED) "s,\(^includedir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
-	$(SED) "s,\(^bindir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index b64b0e33d..260096bb6 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -10,6 +10,7 @@ config ADK_PACKAGE_AVAHI_DAEMON
 	select ADK_COMPILE_AVAHI
 	select ADK_PACKAGE_LIBAVAHI
 	select ADK_PACKAGE_LIBDAEMON
+	select ADK_PACKAGE_GLIB
 	help
 	  Avahi is a system which facilitates service discovery on a local network --
 	  this means that you can plug your laptop or computer into a network and
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 83834b872..513b52963 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -21,17 +21,17 @@ PKG_SECTION_2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
+TLDFLAGS+=		-lintl
 $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--disable-glib \
+CONFIGURE_ARGS+=	--enable-glib \
 			--disable-qt3 \
 			--disable-qt4 \
 			--disable-gtk \
 			--disable-dbus \
-			--enable-expat \
 			--enable-libdaemon \
 			--disable-python \
 			--disable-pygtk \
@@ -76,7 +76,5 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LIBAVAHI}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavahi-common.so.* ${IDIR_LIBAVAHI}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libavahi-core.so.* ${IDIR_LIBAVAHI}/usr/lib/
-	${SED} 's,-I$$(includedir),,g' ${WRKINST}/usr/lib/pkgconfig/avahi-core.pc
-	${SED} 's,-L$$(libdir),,g' ${WRKINST}/usr/lib/pkgconfig/avahi-core.pc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bind/Makefile b/package/bind/Makefile
index b527e13b1..748328cf4 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -54,10 +54,9 @@ pre-build:
 
 post-install:
 	# bind server
-	${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin
+	${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/
 	${CP} ./files/bind ${IDIR_BIND_SERVER}/etc
-	find ${IDIR_BIND_SERVER}/etc/bind -name ".svn" | xargs rm -rf
 	# nsupdate
 	${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/
diff --git a/package/bitlbee/Config.in b/package/bitlbee/Config.in
index 086b6e800..a3c61c439 100644
--- a/package/bitlbee/Config.in
+++ b/package/bitlbee/Config.in
@@ -3,7 +3,7 @@ config ADK_PACKAGE_BITLBEE
 	tristate
 	default n
 	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_GLIB2
+	select ADK_PACKAGE_GLIB
 	select ADK_PACKAGE_LIBICONV
 	help
 
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index ea158d197..02bde57af 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -11,7 +11,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2b1674d98804970809de3da3edf0bed2
 PKG_DESCR:=		IRC gateway to IM chat networks
 PKG_SECTION:=		net
-PKG_DEPENDS:=		glib2 libopenssl libiconv
+PKG_DEPENDS:=		glib libopenssl libiconv
 PKG_URL:=		http://www.bitlbee.org
 PKG_SITES:=		http://get.bitlbee.org/src/ \
 			http://get.bitlbee.be/src/ \
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index 65db0067a..543b84f37 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -24,7 +24,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin
+	${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin ${IDIR_CHILLISPOT}/etc
 	${INSTALL_BIN} ./files/chilli.conf \
 		${IDIR_CHILLISPOT}/etc/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/chilli ${IDIR_CHILLISPOT}/usr/sbin/
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index 02d6b2ca5..142e7e61d 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forw