--- /usr/portage/app-editors/bluefish/bluefish-1.0.7.ebuild	2008-04-04 09:05:30.000000000 -0400
+++ /usr/portage/local/my/app-editors/bluefish/bluefish-1.1.6.ebuild	2008-10-22 07:01:51.604398332 -0400
@@ -6,12 +6,14 @@
 
 IUSE="nls spell gnome"
 
+MY_P="${PN}-unstable-${PV}"
+
 DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer."
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${P}.tar.bz2"
+SRC_URI="http://www.bennewitz.com/bluefish/devel/source/${MY_P}.tar.bz2"
 HOMEPAGE="http://bluefish.openoffice.nl/"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND=">=x11-libs/gtk+-2
@@ -23,6 +25,10 @@
 	nls? ( sys-devel/gettext )
 	gnome? ( gnome-base/libgnomeui )"
 
+pkg_setup() {
+	S="${WORKDIR}/${MY_P}"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -32,6 +38,7 @@
 
 src_compile() {
 	econf --disable-update-databases \
+		--disable-xml-catalog-update \
 		`use_enable nls` \
 		`use_with gnome libgnomeui` || die
 	emake || die
@@ -44,4 +51,22 @@
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+
+	einfo "Adding XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
+		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
+		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to add XML catalog entries."
+}
+
+pkg_postrm() {
+	einfo "Removing XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--del 'Bluefish/DTD/Bflang' \
+		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
+		--del 'http://bluefish.openoffice.nl/DTD' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to remove XML catalog entries."
 }